From c76da481f7bb33fe070f98397efc9c15b3084eb9 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: Thu, 4 Mar 2021 18:46:27 +0800
Subject: [PATCH] 1.17.4
---
changelog.md | 6 ++++++
package.json | 27 +++++++++++++--------------
package/build.lua | 2 +-
package/package.lua | 5 ++---
server | 2 +-
setting/schema-zh-cn.json | 20 ++++++++++----------
setting/schema.json | 20 ++++++++++----------
7 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/changelog.md b/changelog.md
index 084244c..7053c53 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 a45a8f8..6215ed2 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 7fff71b..dca331f 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 c34dac9..0203f2e 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 b4979bc..3faac26 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 7ba1e6b..dea4c2f 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 5219a94..d9c728b 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",
--
GitLab