改个名

9 files changed, 24 insertions, 10 deletions

diff --git a/client/out/extension.js b/client/out/extension.js
index d247f89f..15832d8c 100644
--- a/client/out/extension.js
+++ b/client/out/extension.js
@@ -21,22 +21,22 @@ function activate(context) {
             fileEvents: vscode_1.workspace.createFileSystemWatcher('**/.clientrc')
         }
     };
+    let beta = vscode_1.workspace.getConfiguration("Lua.zzzzzz").get("cat");
     let command;
     let platform = os.platform();
     switch (platform) {
         case "win32":
-            command = context.asAbsolutePath(path.join('server', 'Windows', 'bin', 'lua-language-server.exe'));
+            command = context.asAbsolutePath(path.join(beta ? 'server-beta' : 'server', 'Windows', 'bin', beta ? 'lua-beta.exe' : 'lua.exe'));
             break;
         case "linux":
-            command = context.asAbsolutePath(path.join('server', 'Linux', 'bin', 'lua-language-server'));
+            command = context.asAbsolutePath(path.join(beta ? 'server-beta' : 'server', 'Linux', 'bin', beta ? 'lua-beta' : 'lua'));
             fs.chmodSync(command, '777');
             break;
         case "darwin":
-            command = context.asAbsolutePath(path.join('server', 'macOS', 'bin', 'lua-language-server'));
+            command = context.asAbsolutePath(path.join(beta ? 'server-beta' : 'server', 'macOS', 'bin', beta ? 'lua-beta' : 'lua'));
             fs.chmodSync(command, '777');
             break;
     }
-    let beta = vscode_1.workspace.getConfiguration("Lua.zzzzzz").get("cat");
     let serverOptions = {
         command: command,
         args: [
diff --git a/client/out/extension.js.map b/client/out/extension.js.map
index a889b9c7..33e84ae4 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,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
+{"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,IAAI,GAAY,kBAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACxE,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,CACR,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAC/B,SAAS,EACT,KAAK,EACL,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CACjC,CACD,CAAC;YACF,MAAM;QACP,KAAK,OAAO;YACX,OAAO,GAAG,OAAO,CAAC,cAAc,CAC/B,IAAI,CAAC,IAAI,CACR,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAC/B,OAAO,EACP,KAAK,EACL,IAAI,CAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CACxB,CACD,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,CACR,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAC/B,OAAO,EACP,KAAK,EACL,IAAI,CAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CACxB,CACD,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,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;AAxED,4BAwEC;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 83a8f414..6e0c318d 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -29,30 +29,44 @@ export function activate(context: ExtensionContext) {
 		}
 	};
 
+	let beta: boolean = workspace.getConfiguration("Lua.zzzzzz").get("cat");
 	let command: string;
 	let platform: string = os.platform();
 	switch (platform) {
 		case "win32":
 			command = context.asAbsolutePath(
-				path.join('server', 'Windows', 'bin', 'lua-language-server.exe')
+				path.join(
+					beta ? 'server-beta' : 'server',
+					'Windows',
+					'bin',
+					beta ? 'lua-beta.exe' : 'lua.exe'
+				)
 			);
 			break;
 		case "linux":
 			command = context.asAbsolutePath(
-				path.join('server', 'Linux', 'bin', 'lua-language-server')
+				path.join(
+					beta ? 'server-beta' : 'server',
+					'Linux',
+					'bin',
+					beta? 'lua-beta' : 'lua'
+				)
 			);
 			fs.chmodSync(command, '777');
 			break;
 		case "darwin":
 			command = context.asAbsolutePath(
-				path.join('server', 'macOS', 'bin', 'lua-language-server')
+				path.join(
+					beta ? 'server-beta' : 'server',
+					'macOS',
+					'bin',
+					beta? 'lua-beta' : 'lua'
+				)
 			);
 			fs.chmodSync(command, '777');
 			break;
 	}
 
-	let beta: boolean = workspace.getConfiguration("Lua.zzzzzz").get("cat");
-	
 	let serverOptions: ServerOptions = {
 		command: command,
 		args: [
diff --git a/server-beta/Linux/bin/lua-language-server b/server-beta/Linux/bin/lua-beta
index ba602dfe..ba602dfe 100644
--- a/server-beta/Linux/bin/lua-language-server
+++ b/server-beta/Linux/bin/lua-beta
diff --git a/server-beta/Windows/bin/lua-language-server.exe b/server-beta/Windows/bin/lua-beta.exe
index 68030f1e..68030f1e 100644
--- a/server-beta/Windows/bin/lua-language-server.exe
+++ b/server-beta/Windows/bin/lua-beta.exe
diff --git a/server-beta/macOS/bin/lua-language-server b/server-beta/macOS/bin/lua-beta
index cdc8b473..cdc8b473 100644
--- a/server-beta/macOS/bin/lua-language-server
+++ b/server-beta/macOS/bin/lua-beta
diff --git a/server/Linux/bin/lua-language-server b/server/Linux/bin/lua
index ba602dfe..ba602dfe 100644
--- a/server/Linux/bin/lua-language-server
+++ b/server/Linux/bin/lua
diff --git a/server/Windows/bin/lua-language-server.exe b/server/Windows/bin/lua.exe
index 68030f1e..68030f1e 100644
--- a/server/Windows/bin/lua-language-server.exe
+++ b/server/Windows/bin/lua.exe
diff --git a/server/macOS/bin/lua-language-server b/server/macOS/bin/lua
index cdc8b473..cdc8b473 100644
--- a/server/macOS/bin/lua-language-server
+++ b/server/macOS/bin/lua