Skip to content

Fix issues with remapping of .C files #13476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 9, 2025
Merged

Fix issues with remapping of .C files #13476

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
43766fd
Fix an issue if a user explicitly sets a `.C` file to C
Colengms Apr 9, 2025
cfa068c
Update comment
Colengms Apr 9, 2025
0ffea10
Fix bug in prior PR
Colengms Apr 9, 2025
fee31b4
Fix a bug
Colengms Apr 9, 2025
d39939c
More fixes for '.C'
Colengms Apr 9, 2025
9ff2c6b
Merge branch 'main' into dev/coleng/fix_language_change_issue
Colengms Apr 9, 2025
bd1db71
clean up
Colengms Apr 9, 2025
5fc12ff
Merge branch 'dev/coleng/fix_language_change_issue' of https://github…
Colengms Apr 9, 2025
08b64f8
Fix lint
Colengms Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Extension/src/LanguageServer/protocolFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@ export function createProtocolFilter(): Middleware {
const mappingString: string = baseFileName + "@" + document.fileName;
client.addFileAssociations(mappingString, "cpp");
client.sendDidChangeSettings();
// This will cause the file to be closed and reopened.
// This will definitely cause the file to be closed and reopened.
// setTextDocumentLanguage takes precedence over setting the languageId in UI.
void vscode.languages.setTextDocumentLanguage(document, "cpp");
return;
}
// client.takeOwnership() will call client.TrackedDocuments.add() again, but that's ok. It's a Set.
client.takeOwnership(document);
void sendMessage(document);
const editor: vscode.TextEditor | undefined = vscode.window.visibleTextEditors.find(editor => editor.document === document);
if (editor) {
client.onDidChangeVisibleTextEditors([editor]).catch(logAndReturn.undefined);
}
const cppEditors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => util.isCpp(e.document));
client.onDidChangeVisibleTextEditors(cppEditors).catch(logAndReturn.undefined);
}
}
},
Expand Down