Fix .editorConfig setting precedence (#13140)

microsoft · Jan 10, 2025 · fed7a82 · fed7a82
1 parent 941aa60
commit fed7a82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -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) {

diff --git a/Extension/src/LanguageServer/editorConfig.ts b/Extension/src/LanguageServer/editorConfig.ts
@@ -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
                     };
                 }
             });
-Original file 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 @@