diff --git a/client/out/languageserver.js b/client/out/languageserver.js index 33407c1e509fbfcc1c2fed9223a2af3b3a82d222..7c6222b842cb041fc5af44a8d3d845dfa812e9e5 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 d2136554cefe7feb4137bce766d6bc8d82009c0d..99e734b22029401dab108e0cabcc930fffe35da1 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 636794f988a6f122cfca8dc073be503768df4f14..b619b4054cafdaa5a46a4821d9bc3716ce91797a 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 5f2a425c2b46550276694db6dcbb28106c6541df..4ca61ec457822dd14966afa0752340ae8ce180a1 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 5f2a425c2b46550276694db6dcbb28106c6541df +Subproject commit 4ca61ec457822dd14966afa0752340ae8ce180a1