From ed1b18ccadfebfebdeafad16d84a9f3f0698e181 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: Tue, 7 Nov 2023 11:20:54 +0800
Subject: [PATCH] 3.7.1
---
changelog.md | 8 ++++++++
package.json | 18 +++++++++++++++---
package.nls.json | 4 ++++
package.nls.pt-br.json | 4 ++++
package.nls.zh-cn.json | 4 ++++
package.nls.zh-tw.json | 4 ++++
package/build.lua | 2 +-
server | 2 +-
setting/schema-pt-br.json | 16 ++++++++++++++--
setting/schema-zh-cn.json | 16 ++++++++++++++--
setting/schema-zh-tw.json | 16 ++++++++++++++--
setting/schema.json | 16 ++++++++++++++--
12 files changed, 97 insertions(+), 13 deletions(-)
diff --git a/changelog.md b/changelog.md
index c593b33..a6edb61 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 3c45ede..e69ab08 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 7e4fa15..95277ff 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 cff43a9..aa0fdf9 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 dc9a800..5d947bc 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 8a4bbd9..8241019 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 6f85006..469267d 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 d912dfc..5a763b0 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 2673932..92a9d10 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 c5cf802..0c58fa9 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 e5c8edf..4909e18 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 750df30..00201b2 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": [
--
GitLab