diff --git a/changelog.md b/changelog.md
index c593b3300987dca730f25f2799d2c910a5628183..a6edb612774af9528ecf3c2d9ce5b0977c9bbc9e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,13 @@
# changelog
+## 3.7.1
+`2023-11-7`
+* `FIX` [#2299]
+* `FIX` [#2335]
+
+[#2299]: https://github.com/LuaLS/lua-language-server/issues/2299
+[#2335]: https://github.com/LuaLS/lua-language-server/issues/2335
+
## 3.7.0
`2023-8-24`
* `NEW` support `---@type` and `--[[@as]]` for return statement
diff --git a/package.json b/package.json
index 3c45ede91eee7d289cd6f38fc06f8ca3ca09c5fb..e69ab08184952a7e0f4d1802f2276edb98ce5ba3 100644
--- a/package.json
+++ b/package.json
@@ -3088,10 +3088,22 @@
"type": "boolean"
},
"Lua.workspace.checkThirdParty": {
- "default": true,
+ "default": "Ask",
+ "enum": [
+ "Ask",
+ "Apply",
+ "ApplyInMemory",
+ "Disable"
+ ],
"markdownDescription": "%config.workspace.checkThirdParty%",
+ "markdownEnumDescriptions": [
+ "%config.workspace.checkThirdParty.Ask%",
+ "%config.workspace.checkThirdParty.Apply%",
+ "%config.workspace.checkThirdParty.ApplyInMemory%",
+ "%config.workspace.checkThirdParty.Disable%"
+ ],
"scope": "resource",
- "type": "boolean"
+ "type": "string"
},
"Lua.workspace.ignoreDir": {
"default": [
@@ -3341,5 +3353,5 @@
"sponsor": {
"url": "https://github.com/LuaLS/lua-language-server/issues/484"
},
- "version": "3.7.0"
+ "version": "3.7.1"
}
diff --git a/package.nls.json b/package.nls.json
index 7e4fa15c8248683d665252323c2380afae97618c..95277fff22facabbdc318ec93a22e7d849adf5bd 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -220,6 +220,10 @@
"config.window.progressBar": "Show progress bar in status bar.",
"config.window.statusBar": "Show extension status in status bar.",
"config.workspace.checkThirdParty": "Automatic detection and adaptation of third-party libraries, currently supported libraries are:\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "config.workspace.checkThirdParty.Apply": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.ApplyInMemory": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Ask": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Disable": "TODO: Needs documentation",
"config.workspace.ignoreDir": "Ignored files and directories (Use `.gitignore` grammar).",
"config.workspace.ignoreSubmodules": "Ignore submodules.",
"config.workspace.library": "In addition to the current workspace, which directories will load files from. The files in these directories will be treated as externally provided code libraries, and some features (such as renaming fields) will not modify these files.",
diff --git a/package.nls.pt-br.json b/package.nls.pt-br.json
index cff43a90788bfe0741f3c334d8595dc2b815f9a8..aa0fdf9b5eeee24a5e93abf5f48ff967526db7d2 100644
--- a/package.nls.pt-br.json
+++ b/package.nls.pt-br.json
@@ -220,6 +220,10 @@
"config.window.progressBar": "Show progress bar in status bar.",
"config.window.statusBar": "Show extension status in status bar.",
"config.workspace.checkThirdParty": "Automatic detection and adaptation of third-party libraries, currently supported libraries are:\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "config.workspace.checkThirdParty.Apply": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.ApplyInMemory": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Ask": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Disable": "TODO: Needs documentation",
"config.workspace.ignoreDir": "Ignored files and directories (Use `.gitignore` grammar).",
"config.workspace.ignoreSubmodules": "Ignore submodules.",
"config.workspace.library": "In addition to the current workspace, which directories will load files from. The files in these directories will be treated as externally provided code libraries, and some features (such as renaming fields) will not modify these files.",
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
index dc9a8000a893f54b4aa39671db3198a06957d8aa..5d947bcdfede4ba8f1bfb0bbad6f0c1cf8fbdf16 100644
--- a/package.nls.zh-cn.json
+++ b/package.nls.zh-cn.json
@@ -220,6 +220,10 @@
"config.window.progressBar": "在状态栏显示进度条。",
"config.window.statusBar": "在状态栏显示插件状态。",
"config.workspace.checkThirdParty": "自动检测与适配第三方库，目前支持的库为：\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "config.workspace.checkThirdParty.Apply": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.ApplyInMemory": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Ask": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Disable": "TODO: Needs documentation",
"config.workspace.ignoreDir": "忽略的文件与目录（使用 `.gitignore` 语法）。",
"config.workspace.ignoreSubmodules": "忽略子模块。",
"config.workspace.library": "除了当前工作区以外，还会从哪些目录中加载文件。这些目录中的文件将被视作外部提供的代码库，部分操作（如重命名字段）不会修改这些文件。",
diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json
index 8a4bbd95c26facd45ef75e984ce4e66ffd5278a3..8241019b4a4ac5cd07089f49825fd52b09b18bfc 100644
--- a/package.nls.zh-tw.json
+++ b/package.nls.zh-tw.json
@@ -220,6 +220,10 @@
"config.window.progressBar": "在狀態欄顯示進度條。",
"config.window.statusBar": "在狀態欄顯示延伸模組狀態。",
"config.workspace.checkThirdParty": "自動偵測與適應第三方庫，目前支援的庫為：\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "config.workspace.checkThirdParty.Apply": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.ApplyInMemory": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Ask": "TODO: Needs documentation",
+ "config.workspace.checkThirdParty.Disable": "TODO: Needs documentation",
"config.workspace.ignoreDir": "忽略的檔案與目錄（使用 `.gitignore` 語法）。",
"config.workspace.ignoreSubmodules": "忽略子模組。",
"config.workspace.library": "除了目前工作區以外，還會從哪些目錄中載入檔案。這些目錄中的檔案將被視作外部提供的程式碼庫，部分操作（如重新命名欄位）不會修改這些檔案。",
diff --git a/package/build.lua b/package/build.lua
index 6f8500669a8974829f2baa6f5752179231a1e918..469267d28b8681bd4b01383592794118ca3e2929 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
local json = require 'json-beautify'
-local VERSION = "3.7.0"
+local VERSION = "3.7.1"
local package = require 'package.package'
local fsu = require 'fs-utility'
diff --git a/server b/server
index d912dfc05636ca113eb074d637905f4b2514229d..5a763b0ceecc9a817c8ce534dc726f5f6f6e1ac9 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit d912dfc05636ca113eb074d637905f4b2514229d
+Subproject commit 5a763b0ceecc9a817c8ce534dc726f5f6f6e1ac9
diff --git a/setting/schema-pt-br.json b/setting/schema-pt-br.json
index 26739329d5dae8d6cf0931dc6b0eaa12c811e5ef..92a9d10e837f254aee72c1d183344c41751641c4 100644
--- a/setting/schema-pt-br.json
+++ b/setting/schema-pt-br.json
@@ -3357,10 +3357,22 @@
}
},
"workspace.checkThirdParty": {
- "default": true,
+ "default": "Ask",
+ "enum": [
+ "Ask",
+ "Apply",
+ "ApplyInMemory",
+ "Disable"
+ ],
"markdownDescription": "Automatic detection and adaptation of third-party libraries, currently supported libraries are:\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "markdownEnumDescriptions": [
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation"
+ ],
"scope": "resource",
- "type": "boolean"
+ "type": "string"
},
"workspace.ignoreDir": {
"default": [
diff --git a/setting/schema-zh-cn.json b/setting/schema-zh-cn.json
index c5cf80289f6d2cb70843efaede9e23b8d8efeda3..0c58fa95e470cfa0045c3a149bd00596a4615c20 100644
--- a/setting/schema-zh-cn.json
+++ b/setting/schema-zh-cn.json
@@ -3357,10 +3357,22 @@
}
},
"workspace.checkThirdParty": {
- "default": true,
+ "default": "Ask",
+ "enum": [
+ "Ask",
+ "Apply",
+ "ApplyInMemory",
+ "Disable"
+ ],
"markdownDescription": "自动检测与适配第三方库，目前支持的库为：\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "markdownEnumDescriptions": [
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation"
+ ],
"scope": "resource",
- "type": "boolean"
+ "type": "string"
},
"workspace.ignoreDir": {
"default": [
diff --git a/setting/schema-zh-tw.json b/setting/schema-zh-tw.json
index e5c8edf94c731d14a3c0fd127a55b9cf34b034f5..4909e18bce375e367c81a7a6e02949cc100d07a5 100644
--- a/setting/schema-zh-tw.json
+++ b/setting/schema-zh-tw.json
@@ -3357,10 +3357,22 @@
}
},
"workspace.checkThirdParty": {
- "default": true,
+ "default": "Ask",
+ "enum": [
+ "Ask",
+ "Apply",
+ "ApplyInMemory",
+ "Disable"
+ ],
"markdownDescription": "自動偵測與適應第三方庫，目前支援的庫為：\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "markdownEnumDescriptions": [
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation"
+ ],
"scope": "resource",
- "type": "boolean"
+ "type": "string"
},
"workspace.ignoreDir": {
"default": [
diff --git a/setting/schema.json b/setting/schema.json
index 750df300f03328202dc0e932f3612d7d889e0629..00201b271e2537e88f6d5bbc9920d563b2043dce 100644
--- a/setting/schema.json
+++ b/setting/schema.json
@@ -3357,10 +3357,22 @@
}
},
"workspace.checkThirdParty": {
- "default": true,
+ "default": "Ask",
+ "enum": [
+ "Ask",
+ "Apply",
+ "ApplyInMemory",
+ "Disable"
+ ],
"markdownDescription": "Automatic detection and adaptation of third-party libraries, currently supported libraries are:\n\n* OpenResty\n* Cocos4.0\n* LÖVE\n* LÖVR\n* skynet\n* Jass\n",
+ "markdownEnumDescriptions": [
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation",
+ "TODO: Needs documentation"
+ ],
"scope": "resource",
- "type": "boolean"
+ "type": "string"
},
"workspace.ignoreDir": {
"default": [