From 7d051394e6e0725b503921fd878ae49bc18a1546 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Wed, 8 Nov 2023 12:29:01 -0800 Subject: [PATCH] Remove the 'Extract to function' experimentalFeatures requirement. (#11638) --- Extension/CHANGELOG.md | 10 ++++++++-- .../src/LanguageServer/Providers/codeActionProvider.ts | 7 ------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index 867c036e5b..ef2ab4aa21 100644 --- a/Extension/CHANGELOG.md +++ b/Extension/CHANGELOG.md @@ -1,11 +1,18 @@ # C/C++ for Visual Studio Code Changelog -## Version 1.18.2: November 7, 2023 +## Version 1.18.2: November 8, 2023 +### Enhancement +* 'Extract to function' is enabled without `C_Cpp.experimentalFeatures` being set to `"enabled"`. + ### Bug Fixes +* Fix 'Extract to function' for functions in a header file . [#11466](https://github.com/microsoft/vscode-cpptools/issues/11466) +* Fix 'Extract to function' for functions in an anonymous namespace. [#11474](https://github.com/microsoft/vscode-cpptools/issues/11474) +* Fix 'Extract to function' for C code with typedefs or structs. [#11475](https://github.com/microsoft/vscode-cpptools/issues/11475) * Fix an IntelliSense crash when hovering over an invalid array index expression. [#11510](https://github.com/microsoft/vscode-cpptools/issues/11510) * Fix 'Add #include' code actions not appearing for "is not a template" errors. [#11543](https://github.com/microsoft/vscode-cpptools/issues/11543) * Fix 'Extract to function' bugs with formatting and selection. [#11614](https://github.com/microsoft/vscode-cpptools/issues/11614), [#11619](https://github.com/microsoft/vscode-cpptools/issues/11619) * Fix 'Add #include' code actions being available for system headers that are already included. [#11618](https://github.com/microsoft/vscode-cpptools/issues/11618) +* Fix an IntelliSense crash when selecting code. ## Version 1.18.1: November 2, 2023 ### New Feature @@ -20,7 +27,6 @@ ### Bug Fixes * Fix no error message getting shown if 'Extract to Function' creation fails. [#11567](https://github.com/microsoft/vscode-cpptools/issues/11567) * Fix an autocomplete crash bug (primarily on Mac). -* Fix an IntelliSense crash when selecting code. ## Version 1.18.0: October 12, 2023 ### New Features diff --git a/Extension/src/LanguageServer/Providers/codeActionProvider.ts b/Extension/src/LanguageServer/Providers/codeActionProvider.ts index e7fe8e11da..505b5171a4 100644 --- a/Extension/src/LanguageServer/Providers/codeActionProvider.ts +++ b/Extension/src/LanguageServer/Providers/codeActionProvider.ts @@ -88,7 +88,6 @@ export class CodeActionProvider implements vscode.CodeActionProvider { this.client.configuration.CurrentConfiguration?.compilerPathInCppPropertiesJson !== undefined || !!this.client.configuration.CurrentConfiguration?.compileCommandsInCppPropertiesJson || !!this.client.configuration.CurrentConfiguration?.configurationProviderInCppPropertiesJson; - const hasExperimentalFeatures: boolean = new CppSettings().experimentalFeatures ?? false; // Convert to vscode.CodeAction array let hasInlineMacro: boolean = false; @@ -216,17 +215,11 @@ export class CodeActionProvider implements vscode.CodeActionProvider { } } else if (command.command === "C_Cpp.ExtractToFunction" || command.command === "C_Cpp.ExtractToMemberFunction") { - if (!hasExperimentalFeatures) { - return; - } codeActionKind = CodeActionProvider.extractToFunctionKind; } else if (command.command === "C_Cpp.ExtractToFreeFunction") { // TODO: https://github.com/microsoft/vscode-cpptools/issues/11473 needs to be fixed. return; } else if (command.command === "C_Cpp.ExpandSelection") { - if (!hasExperimentalFeatures) { - return; - } codeActionKind = CodeActionProvider.expandSelectionKind; } const vscodeCodeAction: vscode.CodeAction = {