Merge pull request #10609 from microsoft/main

Merge for 1.14.4 (2nd time)
microsoft · Feb 28, 2023 · ec47886 · ec47886
2 parents 81a0264 + 40fe35c
commit ec47886
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,14 +1,17 @@
 # C/C++ for Visual Studio Code Changelog
 
-## Version 1.14.4: February 27, 2023
+## Version 1.14.4: February 28, 2023
 ### Enhancements
 * Add `c23` and `c2x` support for clang and gcc modes. [#7471](https://github.com/microsoft/vscode-cpptools/issues/7471)
 * Filter out clang-tidy `#pragma once in main file` warnings. [#10539](https://github.com/microsoft/vscode-cpptools/issues/10539)
+* Auto-configure `configurationProvider` even if `default.compilerPath` is set. [PR #10607](https://github.com/microsoft/vscode-cpptools/pull/10607)
 
 ### Bug Fixes
 * Fix `--` in args making compiler querying fail. [#10529](https://github.com/microsoft/vscode-cpptools/issues/10529)
 * Fix every .C file being opened in a compile_commands.json if it's build for C++. [#10540](https://github.com/microsoft/vscode-cpptools/issues/10540)
 * Fix `-std=c++` not being used in compile_commands.json for .C files. [#10541](https://github.com/microsoft/vscode-cpptools/issues/10541)
+* Fix a crash when an error occurs in a forced include. [#10598](https://github.com/microsoft/vscode-cpptools/issues/10598)
+* Fix the configuration provider browse cache not getting cleared. [PR #10608](https://github.com/microsoft/vscode-cpptools/pull/10608)
 * Fix a bug that could cause IntelliSense to randomly stop updating.
 * Fix some random failures that could happen during database deletion.
 * Fix some random crashes on shutdown.

diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -951,8 +951,6 @@ export class CppProperties {
                 // and there is only 1 registered custom config provider, default to using that provider.
                 const providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
                 const hasEmptyConfiguration: boolean = !this.propertiesFile
-                    && !settings.defaultCompilerPath
-                    && settings.defaultCompilerPath !== ""
                     && !settings.defaultIncludePath
                     && !settings.defaultDefines
                     && !settings.defaultMacFrameworkPath
@@ -2134,6 +2132,16 @@ export class CppProperties {
     }
 
     dispose(): void {
+        if (this.lastCustomBrowseConfigurationProviderId !== undefined) {
+            const config: Configuration | undefined = this.CurrentConfiguration;
+            if (config !== undefined && config.configurationProvider !== this.lastCustomBrowseConfigurationProviderId.Value) {
+                this.lastCustomBrowseConfigurationProviderId.Value = undefined;
+                if (this.lastCustomBrowseConfiguration !== undefined) {
+                    this.lastCustomBrowseConfiguration.Value = undefined;
+                }
+            }
+        }
+
         this.disposables.forEach((d) => d.dispose());
         this.disposables = [];