From d362ef9814da3f7169b7919dc6cae973b99c9d79 Mon Sep 17 00:00:00 2001
From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com>
Date: Thu, 21 Nov 2019 12:30:17 -0800
Subject: [PATCH] Add strings for m32/m64 compiler fallback (#4644)

---
 Extension/src/LanguageServer/client.ts    | 2 +-
 Extension/src/LanguageServer/extension.ts | 3 +--
 Extension/src/nativeStrings.json          | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
index 2bd14a8538..6bf769163b 100644
--- 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
index 9b72c0c9bb..80cd8939ed 100644
--- 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
index 10f2009bec..0133f13fe2 100644
--- 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"
 }