根据选项启用测试版语言服务

4 files changed, 11 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index cacc09c0..1bbde4c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ node_modules
 .vscode-test
 .vscode/ipch
 /server/log
-/server/*.so
+/server-beta/log
 /publish
 /build/
 !*.exe
diff --git a/client/out/extension.js b/client/out/extension.js
index a58ee366..d247f89f 100644
--- a/client/out/extension.js
+++ b/client/out/extension.js
@@ -36,16 +36,17 @@ function activate(context) {
             fs.chmodSync(command, '777');
             break;
     }
+    let beta = vscode_1.workspace.getConfiguration("Lua.zzzzzz").get("cat");
     let serverOptions = {
         command: command,
         args: [
             '-E',
             '-e',
             'LANG="' + language + '"',
-            context.asAbsolutePath(path.join('server', 'main.lua'))
+            context.asAbsolutePath(path.join(beta ? 'server-beta' : 'server', 'main.lua'))
         ]
     };
-    client = new vscode_languageclient_1.LanguageClient('Lua Language Server', 'Lua Language Client', serverOptions, clientOptions);
+    client = new vscode_languageclient_1.LanguageClient('Lua', 'Lua', serverOptions, clientOptions);
     client.start();
 }
 exports.activate = activate;
diff --git a/client/out/extension.js.map b/client/out/extension.js.map
index f370f08e..a889b9c7 100644
--- a/client/out/extension.js.map
+++ b/client/out/extension.js.map
@@ -1 +1 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,6BAA6B;AAC7B,yBAAyB;AACzB,yBAAyB;AACzB,mCAA0D;AAE1D,iEAI+B;AAE/B,IAAI,MAAsB,CAAC;AAE3B,SAAgB,QAAQ,CAAC,OAAyB;IACjD,IAAI,QAAQ,GAAG,YAAG,CAAC,QAAQ,CAAC;IAE5B,yCAAyC;IACzC,IAAI,aAAa,GAA0B;QAC1C,+CAA+C;QAC/C,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvD,WAAW,EAAE;YACZ,sFAAsF;YACtF,UAAU,EAAE,kBAAS,CAAC,uBAAuB,CAAC,cAAc,CAAC;SAC7D;KACD,CAAC;IAEF,IAAI,OAAe,CAAC;IACpB,IAAI,QAAQ,GAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;IACrC,QAAQ,QAAQ,EAAE;QACjB,KAAK,OAAO;YACX,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,yBAAyB,CAAC,CAChE,CAAC;YACF,MAAM;QACP,KAAK,OAAO;YACX,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAC1D,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,MAAM;QACP,KAAK,QAAQ;YACZ,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAC1D,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,MAAM;KACP;IAED,IAAI,aAAa,GAAkB;QAClC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACL,IAAI;YACJ,IAAI;YACJ,QAAQ,GAAG,QAAQ,GAAG,GAAG;YACzB,OAAO,CAAC,cAAc,CACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAC/B;SACD;KACD,CAAC;IAEF,MAAM,GAAG,IAAI,sCAAc,CAC1B,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,aAAa,CACb,CAAC;IAEF,MAAM,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAvDD,4BAuDC;AAED,SAAgB,UAAU;IACzB,IAAI,CAAC,MAAM,EAAE;QACZ,OAAO,SAAS,CAAC;KACjB;IACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AALD,gCAKC"}
\ No newline at end of file
+{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,6BAA6B;AAC7B,yBAAyB;AACzB,yBAAyB;AACzB,mCAA0D;AAE1D,iEAI+B;AAE/B,IAAI,MAAsB,CAAC;AAE3B,SAAgB,QAAQ,CAAC,OAAyB;IACjD,IAAI,QAAQ,GAAG,YAAG,CAAC,QAAQ,CAAC;IAE5B,yCAAyC;IACzC,IAAI,aAAa,GAA0B;QAC1C,+CAA+C;QAC/C,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvD,WAAW,EAAE;YACZ,sFAAsF;YACtF,UAAU,EAAE,kBAAS,CAAC,uBAAuB,CAAC,cAAc,CAAC;SAC7D;KACD,CAAC;IAEF,IAAI,OAAe,CAAC;IACpB,IAAI,QAAQ,GAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;IACrC,QAAQ,QAAQ,EAAE;QACjB,KAAK,OAAO;YACX,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,yBAAyB,CAAC,CAChE,CAAC;YACF,MAAM;QACP,KAAK,OAAO;YACX,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAC1D,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,MAAM;QACP,KAAK,QAAQ;YACZ,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAC1D,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,MAAM;KACP;IAED,IAAI,IAAI,GAAY,kBAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAExE,IAAI,aAAa,GAAkB;QAClC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACL,IAAI;YACJ,IAAI;YACJ,QAAQ,GAAG,QAAQ,GAAG,GAAG;YACzB,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAC/B,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAC/B,UAAU,CACV,CAAC;SACF;KACD,CAAC;IAEF,MAAM,GAAG,IAAI,sCAAc,CAC1B,KAAK,EACL,KAAK,EACL,aAAa,EACb,aAAa,CACb,CAAC;IAEF,MAAM,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AA1DD,4BA0DC;AAED,SAAgB,UAAU;IACzB,IAAI,CAAC,MAAM,EAAE;QACZ,OAAO,SAAS,CAAC;KACjB;IACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AALD,gCAKC"}
\ No newline at end of file
diff --git a/client/src/extension.ts b/client/src/extension.ts
index 83f45544..83a8f414 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -50,6 +50,8 @@ export function activate(context: ExtensionContext) {
 			fs.chmodSync(command, '777');
 			break;
 	}
+
+	let beta: boolean = workspace.getConfiguration("Lua.zzzzzz").get("cat");
 	
 	let serverOptions: ServerOptions = {
 		command: command,
@@ -57,9 +59,10 @@ export function activate(context: ExtensionContext) {
 			'-E',
 			'-e',
 			'LANG="' + language + '"',
-			context.asAbsolutePath(
-				path.join('server', 'main.lua')
-			)
+			context.asAbsolutePath(path.join(
+				beta ? 'server-beta' : 'server',
+				'main.lua'
+			))
 		]
 	};