Merge pull request #12658 from microsoft/main

Merge for 1.22.2
microsoft · Aug 30, 2024 · 317df57 · 317df57
2 parents f63c365 + 86b698b
commit 317df57
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 37 deletions.
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,5 +1,12 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.22.2: August 29, 2024
+### Enhancement
+* Remove the `C_Cpp.intelliSenseEngineFallback` setting. [#12596](https://github.com/microsoft/vscode-cpptools/issues/12596)
+
+### Bug Fix
+* Fix a deadlock when doing "Find All References" and a file is deleted. [#12656](https://github.com/microsoft/vscode-cpptools/issues/12656)
+
 ## Version 1.22.1: August 29, 2024
 ### Enhancement
 * Add "Additional Tracked Settings" to `C/C++: Log Diagnostics` output. [PR #12635](https://github.com/microsoft/vscode-cpptools/pull/12635)

diff --git a/Extension/package.json b/Extension/package.json
@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.22.1-main",
+    "version": "1.22.2-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",
@@ -915,16 +915,6 @@
                         ],
                         "scope": "resource"
                     },
-                    "C_Cpp.intelliSenseEngineFallback": {
-                        "type": "string",
-                        "enum": [
-                            "enabled",
-                            "disabled"
-                        ],
-                        "default": "disabled",
-                        "markdownDescription": "%c_cpp.configuration.intelliSenseEngineFallback.markdownDescription%",
-                        "scope": "resource"
-                    },
                     "C_Cpp.exclusionPolicy": {
                         "type": "string",
                         "enum": [
@@ -3342,11 +3332,6 @@
                 "title": "%c_cpp.command.disableErrorSquiggles.title%",
                 "category": "C/C++"
             },
-            {
-                "command": "C_Cpp.ToggleIncludeFallback",
-                "title": "%c_cpp.command.toggleIncludeFallback.title%",
-                "category": "C/C++"
-            },
             {
                 "command": "C_Cpp.ToggleDimInactiveRegions",
                 "title": "%c_cpp.command.toggleDimInactiveRegions.title%",
@@ -5864,10 +5849,6 @@
                     "command": "C_Cpp.DisableErrorSquiggles",
                     "when": "config.C_Cpp.intelliSenseEngine =~ /^[dD]efault$/"
                 },
-                {
-                    "command": "C_Cpp.ToggleIncludeFallback",
-                    "when": "config.C_Cpp.intelliSenseEngine =~ /^[dD]efault$/"
-                },
                 {
                     "command": "C_Cpp.ToggleDimInactiveRegions",
                     "when": "config.C_Cpp.intelliSenseEngine =~ /^[dD]efault$/"

diff --git a/Extension/package.nls.json b/Extension/package.nls.json
@@ -17,7 +17,6 @@
     "c_cpp.command.switchHeaderSource.title": "Switch Header/Source",
     "c_cpp.command.enableErrorSquiggles.title": "Enable Error Squiggles",
     "c_cpp.command.disableErrorSquiggles.title": "Disable Error Squiggles",
-    "c_cpp.command.toggleIncludeFallback.title": "Toggle IntelliSense Engine Fallback on Include Errors",
     "c_cpp.command.toggleDimInactiveRegions.title": "Toggle Inactive Region Colorization",
     "c_cpp.command.resetDatabase.title": "Reset IntelliSense Database",
     "c_cpp.command.takeSurvey.title": "Take Survey",
@@ -469,12 +468,6 @@
     "c_cpp.configuration.intelliSenseEngine.default.description": "Provides context-aware results via a separate IntelliSense process.",
     "c_cpp.configuration.intelliSenseEngine.tagParser.description": "Provides \"fuzzy\" results that are not context-aware.",
     "c_cpp.configuration.intelliSenseEngine.disabled.description": "Turns off C/C++ language service features.",
-    "c_cpp.configuration.intelliSenseEngineFallback.markdownDescription": {
-        "message": "Controls whether the IntelliSense engine will automatically switch to the Tag Parser for translation units containing `#include` errors.",
-        "comment": [
-            "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
-        ]
-    },
     "c_cpp.configuration.autocomplete.markdownDescription": {
         "message": "Controls the auto-completion provider. If `disabled` and you want word-based completion, you will also need to set `\"[cpp]\": {\"editor.wordBasedSuggestions\": <value>}` (and similarly for `c` and `cuda-cpp` languages).",
         "comment": [

diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -1326,7 +1326,6 @@ export class DefaultClient implements Client {
         const result: WorkspaceFolderSettingsParams = {
             uri: workspaceFolderUri?.toString(),
             intelliSenseEngine: settings.intelliSenseEngine,
-            intelliSenseEngineFallback: settings.intelliSenseEngineFallback,
             autocomplete: settings.autocomplete,
             autocompleteAddParentheses: settings.autocompleteAddParentheses,
             errorSquiggles: settings.errorSquiggles,

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -359,7 +359,6 @@ export function registerCommands(enabled: boolean): void {
     commandDisposables.push(vscode.commands.registerCommand('C_Cpp.AddToIncludePath', enabled ? onAddToIncludePath : onDisabledCommand));
     commandDisposables.push(vscode.commands.registerCommand('C_Cpp.EnableErrorSquiggles', enabled ? onEnableSquiggles : onDisabledCommand));
     commandDisposables.push(vscode.commands.registerCommand('C_Cpp.DisableErrorSquiggles', enabled ? onDisableSquiggles : onDisabledCommand));
-    commandDisposables.push(vscode.commands.registerCommand('C_Cpp.ToggleIncludeFallback', enabled ? onToggleIncludeFallback : onDisabledCommand));
     commandDisposables.push(vscode.commands.registerCommand('C_Cpp.ToggleDimInactiveRegions', enabled ? onToggleDimInactiveRegions : onDisabledCommand));
     commandDisposables.push(vscode.commands.registerCommand('C_Cpp.PauseParsing', enabled ? onPauseParsing : onDisabledCommand));
     commandDisposables.push(vscode.commands.registerCommand('C_Cpp.ResumeParsing', enabled ? onResumeParsing : onDisabledCommand));
@@ -754,12 +753,6 @@ function onDisableSquiggles(): void {
     settings.update<string>("errorSquiggles", "disabled");
 }
 
-function onToggleIncludeFallback(): void {
-    // This only applies to the active client.
-    const settings: CppSettings = new CppSettings(clients.ActiveClient.RootUri);
-    settings.toggleSetting("intelliSenseEngineFallback", "enabled", "disabled");
-}
-
 function onToggleDimInactiveRegions(): void {
     // This only applies to the active client.
     const settings: CppSettings = new CppSettings(clients.ActiveClient.RootUri);

diff --git a/Extension/src/LanguageServer/settings.ts b/Extension/src/LanguageServer/settings.ts
@@ -37,7 +37,6 @@ export interface Associations {
 export interface WorkspaceFolderSettingsParams {
     uri: string | undefined;
     intelliSenseEngine: string;
-    intelliSenseEngineFallback: boolean;
     autocomplete: string;
     autocompleteAddParentheses: boolean;
     errorSquiggles: string;
@@ -367,7 +366,6 @@ export class CppSettings extends Settings {
     public get experimentalFeatures(): boolean { return this.getAsString("experimentalFeatures").toLowerCase() === "enabled"; }
     public get suggestSnippets(): boolean { return this.getAsBoolean("suggestSnippets"); }
     public get intelliSenseEngine(): string { return this.getAsString("intelliSenseEngine"); }
-    public get intelliSenseEngineFallback(): boolean { return this.getAsString("intelliSenseEngineFallback").toLowerCase() === "enabled"; }
     public get intelliSenseCachePath(): string | undefined { return changeBlankStringToUndefined(this.getAsStringOrUndefined("intelliSenseCachePath")); }
     public get intelliSenseCacheSize(): number { return this.getAsNumber("intelliSenseCacheSize"); }
     public get intelliSenseMemoryLimit(): number { return this.getAsNumber("intelliSenseMemoryLimit"); }