diff --git a/changelog.md b/changelog.md index 084244cb798d7f2aa9772351de6e50683ba78269..7053c53cd69a7e95d85eee22a66db5e5a40831d0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,17 @@ # changelog +## 1.17.4 +`2021-3-4` +* `FIX` [#437](https://github.com/sumneko/lua-language-server/issues/437) again +* `FIX` [#438](https://github.com/sumneko/lua-language-server/issues/438) + ## 1.17.3 `2021-3-3` * `CHG` intelli-scense: treat `V[]` as `table<integer, V>` in `pairs` * `FIX` completion: `detail` disappears during continuous input * `FIX` [#435](https://github.com/sumneko/lua-language-server/issues/435) * `FIX` [#436](https://github.com/sumneko/lua-language-server/issues/436) +* `FIX` [#437](https://github.com/sumneko/lua-language-server/issues/437) ## 1.17.2 `2021-3-2` diff --git a/package.json b/package.json index a45a8f804a2ac581d89f18b6e3cba281606c88b9..6215ed2cb9453623960704bd8b5e4863edf6b043 100644 --- a/package.json +++ b/package.json @@ -952,6 +952,16 @@ "scope": "resource", "type": "integer" }, + "Lua.runtime.fileEncoding": { + "default": "utf8", + "enum": [ + "utf8", + "ansi" + ], + "markdownDescription": "%config.runtime.fileEncoding%", + "scope": "resource", + "type": "string" + }, "Lua.runtime.nonstandardSymbol": { "items": { "enum": [ @@ -1098,16 +1108,6 @@ "markdownDescription": "%config.workspace.useGitIgnore%", "scope": "resource", "type": "boolean" - }, - "lua.runtime.fileEncoding": { - "default": "utf8", - "enum": [ - "utf8", - "ansi" - ], - "markdownDescription": "%config.runtime.fileEncoding%", - "scope": "resource", - "type": "string" } }, "title": "Lua", @@ -1157,9 +1157,8 @@ "icon": "images/logo.png", "keywords": [ "Lua", - "LSP", - "GoTo Definition", - "IntelliSense" + "IntelliSense", + "EmmyLua" ], "license": "MIT", "main": "./client/out/extension", @@ -1169,5 +1168,5 @@ "type": "git", "url": "https://github.com/sumneko/lua-language-server" }, - "version": "1.17.3" + "version": "1.17.4" } diff --git a/package/build.lua b/package/build.lua index 7fff71b3d330724a5ce029b487e69894e34e93f0..dca331f7b8a90c436e795ddbe1255e62b13dc684 100644 --- a/package/build.lua +++ b/package/build.lua @@ -1,6 +1,6 @@ local json = require 'json-beautify' -local VERSION = "1.17.3" +local VERSION = "1.17.4" local package = require 'package.package' local fsu = require 'fs-utility' diff --git a/package/package.lua b/package/package.lua index c34dac919be6236fe6b0fcb403e39e47b737878f..0203f2e6facc68fa9013aef562dd322e963def0c 100644 --- a/package/package.lua +++ b/package/package.lua @@ -17,9 +17,8 @@ return { }, keywords = { "Lua", - "LSP", - "GoTo Definition", - "IntelliSense" + "IntelliSense", + "EmmyLua", }, engines = { vscode = "^1.23.0" diff --git a/server b/server index b4979bcac367a4f8b1cf953ab9ab7cf675e3f18d..3faac26bdbf07e758d99889e9971a80c1d04d3d9 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit b4979bcac367a4f8b1cf953ab9ab7cf675e3f18d +Subproject commit 3faac26bdbf07e758d99889e9971a80c1d04d3d9 diff --git a/setting/schema-zh-cn.json b/setting/schema-zh-cn.json index 7ba1e6b48cdcf2baf083792c5f2d10c1c7026de1..dea4c2f80fe4de4ce7b32f5b81808cdbea553aa2 100644 --- a/setting/schema-zh-cn.json +++ b/setting/schema-zh-cn.json @@ -936,6 +936,16 @@ "scope": "resource", "type": "integer" }, + "Lua.runtime.fileEncoding": { + "default": "utf8", + "enum": [ + "utf8", + "ansi" + ], + "markdownDescription": "文件编码,`ansi` 选项只在 `Windows` 平台下有效。", + "scope": "resource", + "type": "string" + }, "Lua.runtime.nonstandardSymbol": { "items": { "enum": [ @@ -1082,16 +1092,6 @@ "markdownDescription": "忽略 `.gitignore` 中列举的文件。", "scope": "resource", "type": "boolean" - }, - "lua.runtime.fileEncoding": { - "default": "utf8", - "enum": [ - "utf8", - "ansi" - ], - "markdownDescription": "文件编码,`ansi` 选项只在 `Windows` 平台下有效。", - "scope": "resource", - "type": "string" } }, "title": "setting", diff --git a/setting/schema.json b/setting/schema.json index 5219a9409fa5ffeaf575f3f2dee4f02ed071dc28..d9c728be78024327afb33a0888294c2771fd9160 100644 --- a/setting/schema.json +++ b/setting/schema.json @@ -936,6 +936,16 @@ "scope": "resource", "type": "integer" }, + "Lua.runtime.fileEncoding": { + "default": "utf8", + "enum": [ + "utf8", + "ansi" + ], + "markdownDescription": "File encoding. The `ansi` option is only available under the `Windows` platform.", + "scope": "resource", + "type": "string" + }, "Lua.runtime.nonstandardSymbol": { "items": { "enum": [ @@ -1082,16 +1092,6 @@ "markdownDescription": "Ignore files list in `.gitignore` .", "scope": "resource", "type": "boolean" - }, - "lua.runtime.fileEncoding": { - "default": "utf8", - "enum": [ - "utf8", - "ansi" - ], - "markdownDescription": "File encoding. The `ansi` option is only available under the `Windows` platform.", - "scope": "resource", - "type": "string" } }, "title": "setting",