From d3e192ed54cef6036794a0dc6c06bbc807699887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= <sumneko@hotmail.com>
Date: Mon, 13 Feb 2023 16:03:49 +0800
Subject: [PATCH] 3.6.11
---
changelog.md | 15 +++++++++++++++
client/3rd/vscode-lua-doc | 2 +-
package.json | 5 +++--
package/build.lua | 2 +-
server | 2 +-
setting/schema-pt-br.json | 3 ++-
setting/schema-zh-cn.json | 3 ++-
setting/schema-zh-tw.json | 3 ++-
setting/schema.json | 3 ++-
9 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/changelog.md b/changelog.md
index 6adb9ac..62d9c36 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,20 @@
# changelog
+## 3.6.11
+`2023-2-13`
+* `CHG` completion: don't show loading process
+* `FIX` [#1886]
+* `FIX` [#1887]
+* `FIX` [#1889]
+* `FIX` [#1895]
+* `FIX` [#1902]
+
+[#1886]: https://github.com/LuaLS/lua-language-server/issues/1886
+[#1887]: https://github.com/LuaLS/lua-language-server/issues/1887
+[#1889]: https://github.com/LuaLS/lua-language-server/issues/1889
+[#1895]: https://github.com/LuaLS/lua-language-server/issues/1895
+[#1902]: https://github.com/LuaLS/lua-language-server/issues/1902
+
## 3.6.10
`2023-2-7`
* `FIX` [#1869]
diff --git a/client/3rd/vscode-lua-doc b/client/3rd/vscode-lua-doc
index ac128f4..208d871 160000
--- a/client/3rd/vscode-lua-doc
+++ b/client/3rd/vscode-lua-doc
@@ -1 +1 @@
-Subproject commit ac128f4e47c019d41ec0d97adbf1a9a52a916e4e
+Subproject commit 208d871010255661ea9ea8933f426c12fb173af0
diff --git a/package.json b/package.json
index a6610e6..fd87707 100644
--- a/package.json
+++ b/package.json
@@ -2682,7 +2682,8 @@
"xpcall",
"assert",
"error",
- "type"
+ "type",
+ "os.exit"
],
"type": "string"
}
@@ -3054,5 +3055,5 @@
"sponsor": {
"url": "https://github.com/LuaLS/lua-language-server/issues/484"
},
- "version": "3.6.10"
+ "version": "3.6.11"
}
diff --git a/package/build.lua b/package/build.lua
index fb4603d..7cc74f7 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
local json = require 'json-beautify'
-local VERSION = "3.6.10"
+local VERSION = "3.6.11"
local package = require 'package.package'
local fsu = require 'fs-utility'
diff --git a/server b/server
index 42f48c7..21420c9 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 42f48c7777abe9243372688701f8609ce923168c
+Subproject commit 21420c986d807a55e22dd9b4261c3e3279a19eb0
diff --git a/setting/schema-pt-br.json b/setting/schema-pt-br.json
index 48c1357..b2f916e 100644
--- a/setting/schema-pt-br.json
+++ b/setting/schema-pt-br.json
@@ -2857,7 +2857,8 @@
"xpcall",
"assert",
"error",
- "type"
+ "type",
+ "os.exit"
],
"type": "string"
}
diff --git a/setting/schema-zh-cn.json b/setting/schema-zh-cn.json
index 36176f7..71ffe7f 100644
--- a/setting/schema-zh-cn.json
+++ b/setting/schema-zh-cn.json
@@ -2857,7 +2857,8 @@
"xpcall",
"assert",
"error",
- "type"
+ "type",
+ "os.exit"
],
"type": "string"
}
diff --git a/setting/schema-zh-tw.json b/setting/schema-zh-tw.json
index faf922a..2ea9feb 100644
--- a/setting/schema-zh-tw.json
+++ b/setting/schema-zh-tw.json
@@ -2857,7 +2857,8 @@
"xpcall",
"assert",
"error",
- "type"
+ "type",
+ "os.exit"
],
"type": "string"
}
diff --git a/setting/schema.json b/setting/schema.json
index e6459fa..f2af5c3 100644
--- a/setting/schema.json
+++ b/setting/schema.json
@@ -2857,7 +2857,8 @@
"xpcall",
"assert",
"error",
- "type"
+ "type",
+ "os.exit"
],
"type": "string"
}
--
GitLab