From 26e014bc5460c0f291af66a5805370dd03310860 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: Fri, 20 Nov 2020 22:00:49 +0800
Subject: [PATCH] no longer beta
---
client/out/languageserver.js | 4 +---
client/src/languageserver.ts | 4 +---
package/configuration.lua | 6 ------
server | 2 +-
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/client/out/languageserver.js b/client/out/languageserver.js
index 33407c1..7c6222b 100644
--- a/client/out/languageserver.js
+++ b/client/out/languageserver.js
@@ -65,8 +65,6 @@ function start(context, documentSelector, folder) {
},
};
let config = vscode_1.workspace.getConfiguration(undefined, folder);
- let beta = config.get("Lua.awakened.cat");
- //let beta: boolean = false;
let develop = config.get("Lua.develop.enable");
let debuggerPort = config.get("Lua.develop.debuggerPort");
let debuggerWait = config.get("Lua.develop.debuggerWait");
@@ -91,7 +89,7 @@ function start(context, documentSelector, folder) {
'-E',
'-e',
`LANG="${language}";DEVELOP=${develop};DBGPORT=${debuggerPort};DBGWAIT=${debuggerWait}`,
- context.asAbsolutePath(path.join('server', beta ? 'main-beta.lua' : 'main.lua'))
+ context.asAbsolutePath(path.join('server', 'main.lua'))
]
};
let client = new node_1.LanguageClient('Lua', 'Lua', serverOptions, clientOptions);
diff --git a/client/src/languageserver.ts b/client/src/languageserver.ts
index d213655..99e734b 100644
--- a/client/src/languageserver.ts
+++ b/client/src/languageserver.ts
@@ -83,8 +83,6 @@ function start(context: ExtensionContext, documentSelector: DocumentSelector, fo
};
let config = Workspace.getConfiguration(undefined, folder);
- let beta: boolean = config.get("Lua.awakened.cat");
- //let beta: boolean = false;
let develop: boolean = config.get("Lua.develop.enable");
let debuggerPort: number = config.get("Lua.develop.debuggerPort");
let debuggerWait: boolean = config.get("Lua.develop.debuggerWait");
@@ -133,7 +131,7 @@ function start(context: ExtensionContext, documentSelector: DocumentSelector, fo
`LANG="${language}";DEVELOP=${develop};DBGPORT=${debuggerPort};DBGWAIT=${debuggerWait}`,
context.asAbsolutePath(path.join(
'server',
- beta ? 'main-beta.lua' : 'main.lua',
+ 'main.lua',
))
]
};
diff --git a/package/configuration.lua b/package/configuration.lua
index 636794f..b619b40 100644
--- a/package/configuration.lua
+++ b/package/configuration.lua
@@ -237,12 +237,6 @@ local config = {
-- default = ".vscode/lua-plugin/*.lua",
-- markdownDescription = "%config.plugin.path%"
--},
- ["Lua.awakened.cat"] = {
- scope = "resource",
- type = "boolean",
- default = true,
- markdownDescription = "%config.awakened.cat%"
- },
["Lua.develop.enable"] = {
scope = "resource",
type = "boolean",
diff --git a/server b/server
index 5f2a425..4ca61ec 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 5f2a425c2b46550276694db6dcbb28106c6541df
+Subproject commit 4ca61ec457822dd14966afa0752340ae8ce180a1
--
GitLab