Skip to content

Fix .editorConfig setting precedence #13140

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
Colengms merged 1 commit into from
Jan 10, 2025
Merged

Fix .editorConfig setting precedence #13140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Extension/src/LanguageServer/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,8 @@ export class DefaultClient implements Client {
void vscode.window.showErrorMessage(localize("unable.to.start", "Unable to start the C/C++ language server. IntelliSense features will be disabled. Error: {0}", additionalInfo));
}
}

this.updateActiveDocumentTextOptions();
}

private async init(rootUri: vscode.Uri | undefined, isFirstClient: boolean) {
Expand Down
4 changes: 2 additions & 2 deletions Extension/src/LanguageServer/editorConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ function getEditorConfig(filePath: string): any {
Object.keys(configData).forEach((section: string) => {
if (section !== '*' && matchesSection(currentDirForwardSlashes, filePath, section)) {
combinedConfig = {
...combinedConfig,
...configData[section]
...configData[section],
...combinedConfig
};
}
});
Expand Down
Loading