Merge pull request #138 from sevkin/137

check before calling platform-specific code

configurations/GDScript.tmLanguage.json

@@ -27,7 +27,7 @@
     { "include": "#any-method" },
     { "include": "#any-property" },
     { "include": "#extends" },
-    { "include": "#parscal_class" }
+    { "include": "#pascal_case_class" }
   ],
   "repository": {
     "comment": {
@@ -328,11 +328,11 @@
         }
       ]
     },
-    "parscal_class": {
+    "pascal_case_class": {
       "captures": {
         "1": { "name": "entity.name.type.class.gdscript" }
       },
-      "match": "([A-Z][a-zA-Z_0-9]*)"
+      "match": "\\b([A-Z][a-zA-Z_0-9]*)\\b"
     }
   }
 }

src/godot-tools.ts

@@ -70,7 +70,7 @@ export class GodotTools {
 					let cmdEsc = `"${cmd}"`;
 					const shell_plugin = vscode.workspace.getConfiguration("terminal.integrated.shell");
 					let shell = shell_plugin ? shell_plugin.get("windows", "") || "" : "";
-					if (shell.endsWith("powershell.exe") && process.platform === "win32") {
+					if (process.platform === "win32" && shell.endsWith("powershell.exe")) {
 						cmdEsc = `&${cmdEsc}`;
 					}
 					return cmdEsc;

src/lsp/GDScriptLanguageClient.ts

@@ -82,7 +82,7 @@ export default class GDScriptLanguageClient extends LanguageClient {
 
 	connect_to_server() {
 		this.status = ClientStatus.PENDING;
-		io.connect_to_language_server();
+		io.connect_to_language_server(get_server_uri());
 	}
 
 	start(): vscode.Disposable {

src/lsp/MessageIO.ts

@@ -12,11 +12,9 @@ export class MessageIO extends EventEmitter {
 	writer: MessageIOWriter = null;
 	
 	private socket: WebSocket = null; 
-	private url: string = "";
 	
 	constructor(url: string) {
 		super();
-		this.url = url;
 	}
 	
 	public send_message(message: string) {
@@ -39,10 +37,10 @@ export class MessageIO extends EventEmitter {
 		this.emit("message", message);
 	}
 	
-	connect_to_language_server():Promise<void> {
+	connect_to_language_server(url: string):Promise<void> {
 		return new Promise((resolve, reject) => {
 			this.socket = null;
-			const ws = new WebSocket(this.url);
+			const ws = new WebSocket(url);
 			ws.on('open', ()=>{ this.on_connected(ws); resolve(); });
 			ws.on('message', this.on_message.bind(this));
 			ws.on('error', this.on_disconnected.bind(this));