Merge branch 'master' of https://github.com/sumneko/lua-language-server into HEAD

Author: CppCXY

.vscode/launch.json

@@ -13,7 +13,6 @@
 			"arg": [
 			],
 			"luaVersion": "5.4",
-			"consoleCoding": "utf8",
 			"sourceCoding": "utf8",
 			"console": "internalConsole",
 			"outputCapture": [
@@ -47,7 +46,6 @@
 			"arg": [
 			],
 			"luaVersion": "latest",
-			"consoleCoding": "utf8",
 			"sourceCoding": "utf8",
 			"outputCapture": [
 				"print",
@@ -67,7 +65,6 @@
 				"${workspaceRoot}",
 			],
 			"luaVersion": "5.4",
-			"consoleCoding": "utf8",
 			"sourceCoding": "utf8",
 			"outputCapture": [
 				"print",
@@ -85,7 +82,6 @@
 			"arg": [
 			],
 			"luaVersion": "latest",
-			"consoleCoding": "utf8",
 			"sourceCoding": "utf8",
 			"outputCapture": [
 				"print",

3rd/bee.lua

@@ -1,9 +1,25 @@
 # changelog
 
+## 3.2.5
+* `FIX` [#1149](https://github.com/sumneko/lua-language-server/issues/1149)
+
 ## 3.2.4
+`2022-5-25`
+* `NEW` settings:
+  + `workspace.supportScheme`: `["file", "untitled", "git"]`
+  + `diagnostics.disableScheme`: `["git"]`
+* `NEW` folding: support folding `---@alias`
+* `CHG` if `rootUri` or `workspaceFolder` is set to `ROOT` or `HOME`, this extension will refuse to load these directories and show an error message.
+* `CHG` show warning message when scanning more than 100,000 files.
+* `CHG` upgrade [LSP](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/) to `3.17`
 * `FIX` hover: can not union `table` with other basic types
 * `FIX` [#1125](https://github.com/sumneko/lua-language-server/issues/1125)
 * `FIX` [#1131](https://github.com/sumneko/lua-language-server/issues/1131)
+* `FIX` [#1134](https://github.com/sumneko/lua-language-server/issues/1134)
+* `FIX` [#1141](https://github.com/sumneko/lua-language-server/issues/1141)
+* `FIX` [#1144](https://github.com/sumneko/lua-language-server/issues/1144)
+* `FIX` [#1150](https://github.com/sumneko/lua-language-server/issues/1150)
+* `FIX` [#1155](https://github.com/sumneko/lua-language-server/issues/1155)
 
 ## 3.2.3
 `2022-5-16`

3rd/lovr-api

@@ -142,6 +142,10 @@ WORKSPACE_DIAGNOSTIC      =
 'Diagnosing workspace'
 WORKSPACE_SKIP_HUGE_FILE  =
 'For performance reasons, the parsing of this file has been stopped: {}'
+WORKSPACE_NOT_ALLOWED     =
+'Your workspace is set to `{}`. Lua language server refused to load this directory. Please check your configuration.[learn more here](https://github.com/sumneko/lua-language-server/wiki/Why-scanning-home-folder)'
+WORKSPACE_SCAN_TOO_MUCH   =
+'More than {} files have been scanned. The current scanned directory is `{}`. Please confirm whether the configuration is correct.'
 
 PARSER_CRASH            =
 'Parser crashed! Last words:{}'

changelog.md

@@ -64,6 +64,8 @@ config.diagnostics.files.Opened   =
 "Only when these files are opened will it be diagnosed."
 config.diagnostics.files.Disable  =
 "These files are not diagnosed."
+config.diagnostics.disableScheme  =
+'Do not diagnose Lua files that use the following scheme.'
 config.workspace.ignoreDir        =
 "Ignored files and directories (Use `.gitignore` grammar)."-- .. example.ignoreDir,
 config.workspace.ignoreSubmodules =
@@ -89,6 +91,8 @@ Automatic detection and adaptation of third-party libraries, currently supported
 ]]
 config.workspace.userThirdParty          =
 'Add private third-party library configuration file paths here, please refer to the built-in [configuration file path](https://github.com/sumneko/lua-language-server/tree/master/meta/3rd)'
+config.workspace.supportScheme           =
+'Provide language server for the Lua files of the following scheme.'
 config.completion.enable                 =
 'Enable completion.'
 config.completion.callSnippet            =

locale/en-us/script.lua

@@ -142,6 +142,10 @@ WORKSPACE_DIAGNOSTIC      =
 'Diagnóstico de espaço de trabalho.'
 WORKSPACE_SKIP_HUGE_FILE  =
 'Por motivos de desempenho, a análise deste arquivo foi interrompida: {}'
+WORKSPACE_NOT_ALLOWED     = -- TODO: need translate!
+'Your workspace is set to `{}`. Lua language server refused to load this directory. Please check your configuration.[learn more here](https://github.com/sumneko/lua-language-server/wiki/Why-scanning-home-folder)'
+WORKSPACE_SCAN_TOO_MUCH   = -- TODO: need translate!
+'More than {} files have been scanned. The current scanned directory is `{}`. Please confirm whether the configuration is correct.'
 
 PARSER_CRASH            =
 'Parser quebrou! Últimas palavras: {}'

locale/en-us/setting.lua

@@ -64,6 +64,8 @@ config.diagnostics.files.Opened   = -- TODO: need translate!
 "Only when these files are opened will it be diagnosed."
 config.diagnostics.files.Disable  = -- TODO: need translate!
 "These files are not diagnosed."
+config.diagnostics.disableScheme  = -- TODO: need translate!
+'Do not diagnose Lua files that use the following scheme.'
 config.workspace.ignoreDir        = -- TODO: need translate!
 "Ignored files and directories (Use `.gitignore` grammar)."-- .. example.ignoreDir,
 config.workspace.ignoreSubmodules = -- TODO: need translate!
@@ -89,6 +91,8 @@ Automatic detection and adaptation of third-party libraries, currently supported
 ]]
 config.workspace.userThirdParty          = -- TODO: need translate!
 'Add private third-party library configuration file paths here, please refer to the built-in [configuration file path](https://github.com/sumneko/lua-language-server/tree/master/meta/3rd)'
+config.workspace.supportScheme           = -- TODO: need translate!
+'Provide language server for the Lua files of the following scheme.'
 config.completion.enable                 = -- TODO: need translate!
 'Enable completion.'
 config.completion.callSnippet            = -- TODO: need translate!

locale/pt-br/script.lua

@@ -142,6 +142,10 @@ WORKSPACE_DIAGNOSTIC      =
 '正在对工作目录进行诊断'
 WORKSPACE_SKIP_HUGE_FILE  =
 '出于性能考虑，已停止对此文件解析：{}'
+WORKSPACE_NOT_ALLOWED     =
+'你的工作目录被设置为了 `{}`，Lua语言服务拒绝加载此目录，请检查你的配置。[了解更多](https://github.com/sumneko/lua-language-server/wiki/Why-scanning-home-folder)'
+WORKSPACE_SCAN_TOO_MUCH   =
+'已扫描了超过 {} 个文件，当前扫描的目录为 `{}`，请确认配置是否正确。'
 
 PARSER_CRASH            =
 '语法解析崩溃了！遗言：{}'

locale/pt-br/setting.lua

@@ -64,6 +64,8 @@ config.diagnostics.files.Opened   =
 "只有打开这些文件时才会诊断。"
 config.diagnostics.files.Disable  =
 "不诊断这些文件。"
+config.diagnostics.disableScheme  =
+'不诊断使用以下 scheme 的lua文件。'
 config.workspace.ignoreDir        =
 "忽略的文件与目录（使用 `.gitignore` 语法）。"
 config.workspace.ignoreSubmodules =
@@ -89,6 +91,8 @@ config.workspace.checkThirdParty  =
 ]]
 config.workspace.userThirdParty          =
 '在这里添加私有的第三方库适配文件路径，请参考内置的[配置文件路径](https://github.com/sumneko/lua-language-server/tree/master/meta/3rd)'
+config.workspace.supportScheme           =
+'为以下 scheme 的lua文件提供语言服务。'
 config.completion.enable                 =
 '启用自动完成。'
 config.completion.callSnippet            =