summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2020-12-25 16:21:39 +0800
committer最萌小汐 <sumneko@hotmail.com>2020-12-25 16:21:39 +0800
commitf77e708c96802a101c44f7a884d1029009c8e8f5 (patch)
tree440be939984440cc16d188bf6f98893a1f177370
parent0ef412cca7932bd01d530a8a52d22469a5852290 (diff)
downloadlua-language-server-f77e708c96802a101c44f7a884d1029009c8e8f5.zip
1.8.1
-rw-r--r--changelog.md3
-rw-r--r--script/timer.lua4
-rw-r--r--script/tracy.lua15
3 files changed, 17 insertions, 5 deletions
diff --git a/changelog.md b/changelog.md
index 3fc65ff2..76681f22 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
# changelog
+## 1.8.1
+* `FIX` telemetry: connect failed caused not working
+
## 1.8.0
`2020-12-23`
* `NEW` runtime: support nonstandard symbol
diff --git a/script/timer.lua b/script/timer.lua
index 1d4343f1..7857be6f 100644
--- a/script/timer.lua
+++ b/script/timer.lua
@@ -2,6 +2,8 @@ local setmetatable = setmetatable
local mathMax = math.max
local mathFloor = math.floor
local osClock = os.clock
+local xpcall = xpcall
+local logError = log.error
_ENV = nil
@@ -43,7 +45,7 @@ local function mWakeup(self)
end
self._running = false
if self._onTimer then
- self:_onTimer()
+ xpcall(self._onTimer, logError, self)
end
if self._removed then
return
diff --git a/script/tracy.lua b/script/tracy.lua
index 69933308..bf93a103 100644
--- a/script/tracy.lua
+++ b/script/tracy.lua
@@ -1,9 +1,16 @@
-local suc = pcall(require, 'luatracy')
-local originTracy = tracy
+local originTracy
local function enable()
- if not suc then
- return
+ if not originTracy then
+ local suc = pcall(require, 'luatracy')
+ if suc then
+ originTracy = tracy
+ else
+ originTracy = {
+ ZoneBeginN = function (info) end,
+ ZoneEnd = function () end,
+ }
+ end
end
tracy = originTracy
end