Add strings for m32/m64 compiler fallback (#4644)

microsoft · Nov 21, 2019 · d362ef9 · d362ef9
1 parent f3b5c50
commit d362ef9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -1994,7 +1994,7 @@ export class DefaultClient implements Client {
 
     private onCompileCommandsChanged(path: string): void {
         let params: FileChangedParams = {
-            uri: path
+            uri: vscode.Uri.file(path).toString()
         };
         this.notifyWhenReady(() => this.languageClient.sendNotification(ChangeCompileCommandsNotification, params));
     }

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -565,8 +565,7 @@ function onDidChangeTextEditorSelection(event: vscode.TextEditorSelectionChangeE
 function onDidChangeVisibleTextEditors(editors: vscode.TextEditor[]): void {
     // Process delayed didOpen for any visible editors we haven't seen before
     editors.forEach(editor => {
-        if (editor.document.languageId === "c" || editor.document.languageId === "cpp"
-            || editor.document.languageId === "json" && editor.document.uri.fsPath.endsWith("c_cpp_properties.json")) {
+        if (editor.document.languageId === "c" || editor.document.languageId === "cpp") {
             let client: Client = clients.getClientFor(editor.document.uri);
             if (client) {
                 if (clients.checkOwnership(client, editor.document)) {

diff --git a/Extension/src/nativeStrings.json b/Extension/src/nativeStrings.json
@@ -150,5 +150,7 @@
     "invalid_file_path": "Invalid file path {0}",
     "cant_create_intellisense_client_for": "Can't create IntelliSense client for {0}",
     "suffix_declaration": "declaration",
-    "suffix_type_alias": "type alias"
+    "suffix_type_alias": "type alias",
+    "fallback_to_32_bit_mode": "Compiler does not support 64-bit. Falling back to 32-bit intelliSenseMode",
+    "fallback_to_64_bit_mode": "Compiler does not support 32-bit. Falling back to 64-bit intelliSenseMode"
 }