From 869ee7bfd86fc451877a18addcb98710347b491b Mon Sep 17 00:00:00 2001
From: Colen Garoutte-Carson <coleng@microsoft.com>
Date: Fri, 10 Jan 2025 15:34:31 -0800
Subject: [PATCH] Fix .editorConfig setting precedence

---
 Extension/src/LanguageServer/client.ts       | 2 ++
 Extension/src/LanguageServer/editorConfig.ts | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
index ac7a53bac..46e2b71ca 100644
--- 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
index b5c8aa1db..4f330073a 100644
--- 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
                     };
                 }
             });