Skip to content

Commit d362ef9

Browse files
authored
Add strings for m32/m64 compiler fallback (#4644)
1 parent f3b5c50 commit d362ef9

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

Extension/src/LanguageServer/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,7 @@ export class DefaultClient implements Client {
19941994

19951995
private onCompileCommandsChanged(path: string): void {
19961996
let params: FileChangedParams = {
1997-
uri: path
1997+
uri: vscode.Uri.file(path).toString()
19981998
};
19991999
this.notifyWhenReady(() => this.languageClient.sendNotification(ChangeCompileCommandsNotification, params));
20002000
}

Extension/src/LanguageServer/extension.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,7 @@ function onDidChangeTextEditorSelection(event: vscode.TextEditorSelectionChangeE
565565
function onDidChangeVisibleTextEditors(editors: vscode.TextEditor[]): void {
566566
// Process delayed didOpen for any visible editors we haven't seen before
567567
editors.forEach(editor => {
568-
if (editor.document.languageId === "c" || editor.document.languageId === "cpp"
569-
|| editor.document.languageId === "json" && editor.document.uri.fsPath.endsWith("c_cpp_properties.json")) {
568+
if (editor.document.languageId === "c" || editor.document.languageId === "cpp") {
570569
let client: Client = clients.getClientFor(editor.document.uri);
571570
if (client) {
572571
if (clients.checkOwnership(client, editor.document)) {

Extension/src/nativeStrings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,5 +150,7 @@
150150
"invalid_file_path": "Invalid file path {0}",
151151
"cant_create_intellisense_client_for": "Can't create IntelliSense client for {0}",
152152
"suffix_declaration": "declaration",
153-
"suffix_type_alias": "type alias"
153+
"suffix_type_alias": "type alias",
154+
"fallback_to_32_bit_mode": "Compiler does not support 64-bit. Falling back to 32-bit intelliSenseMode",
155+
"fallback_to_64_bit_mode": "Compiler does not support 32-bit. Falling back to 64-bit intelliSenseMode"
154156
}

0 commit comments

Comments
 (0)