Skip to content

Remove support for synchronous lightbulbs #67536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 29, 2023
Merged

Remove support for synchronous lightbulbs #67536

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2291c0
Remove synchronous lightbulb code
CyrusNajmabadi Mar 29, 2023
4938c6f
Remove
CyrusNajmabadi Mar 29, 2023
580ee49
Remove subclassing
CyrusNajmabadi Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,8 @@ public SuggestedActionsSourceProvider(
if (textBuffer.IsInLspEditorContext())
return null;

// if user has explicitly set the option defer to that. otherwise, we are enabled by default (unless our
// A/B escape hatch disables us).
var asyncEnabled = _globalOptions.GetOption(SuggestionsOptionsStorage.Asynchronous) is bool b ? b : !_globalOptions.GetOption(SuggestionsOptionsStorage.AsynchronousQuickActionsDisableFeatureFlag);

return asyncEnabled
? new AsyncSuggestedActionsSource(_threadingContext, _globalOptions, this, textView, textBuffer, _suggestedActionCategoryRegistry, this.OperationListener)
: new SyncSuggestedActionsSource(_threadingContext, _globalOptions, this, textView, textBuffer, _suggestedActionCategoryRegistry);
return new AsyncSuggestedActionsSource(
_threadingContext, _globalOptions, this, textView, textBuffer, _suggestedActionCategoryRegistry, this.OperationListener);
}

private static CodeActionRequestPriority? TryGetPriority(string priority)
Expand Down
29 changes: 0 additions & 29 deletions src/EditorFeatures/Core.Wpf/Suggestions/SyncSuggestedActionsSource.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/EditorFeatures/Core/Suggestions/SuggestionsOptionsStorage.cs
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,7 @@
Content="{x:Static local:AdvancedOptionPageStrings.Option_Add_missing_using_directives_on_paste}" />
</StackPanel>
</GroupBox>

<GroupBox x:Uid="QuickActionsBox"
Header="{x:Static local:AdvancedOptionPageStrings.Option_Quick_Actions}">
<StackPanel>
<CheckBox x:Name="ComputeQuickActionsAsynchronouslyExperimental"
Content="{x:Static local:AdvancedOptionPageStrings.Option_Compute_Quick_Actions_asynchronously_experimental}" />
</StackPanel>
</GroupBox>


<GroupBox x:Uid="HighlightingGroupBox"
Header="{x:Static local:AdvancedOptionPageStrings.Option_Highlighting}">
<StackPanel>
Expand Down
7 changes: 0 additions & 7 deletions src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,6 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
BindToOption(SuggestForTypesInNuGetPackages, SymbolSearchOptionsStorage.SearchNuGetPackages, LanguageNames.CSharp);
BindToOption(AddUsingsOnPaste, AddImportOnPasteOptionsStorage.AddImportsOnPaste, LanguageNames.CSharp);

// Quick Actions
BindToOption(ComputeQuickActionsAsynchronouslyExperimental, SuggestionsOptionsStorage.Asynchronous, () =>
{
// If the option has not been set by the user, check if the option is disabled from experimentation.
return !optionStore.GetOption(SuggestionsOptionsStorage.AsynchronousQuickActionsDisableFeatureFlag);
});

// Highlighting
BindToOption(EnableHighlightReferences, ReferenceHighlightingOptionsStorage.ReferenceHighlighting, LanguageNames.CSharp);
BindToOption(EnableHighlightKeywords, KeywordHighlightingOptionsStorage.KeywordHighlighting, LanguageNames.CSharp);
Expand Down
3 changes: 0 additions & 3 deletions src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,6 @@ public static string Option_OptimizeForSolutionSize_Small
public static string Option_Quick_Actions
=> ServicesVSResources.Quick_Actions;

public static string Option_Compute_Quick_Actions_asynchronously_experimental
=> ServicesVSResources.Compute_Quick_Actions_asynchronously_experimental;

public static string Option_Outlining
=> ServicesVSResources.Outlining;

Expand Down
2 changes: 0 additions & 2 deletions src/VisualStudio/Core/Def/Options/VisualStudioOptionStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,6 @@ public bool TryFetch(LocalUserRegistryOptionPersister persister, OptionKey2 opti
{"csharp_split_string_literal_on_return", new RoamingProfileStorage("TextEditor.CSharp.Specific.SplitStringLiterals")},
{"visual_studio_open_stack_trace_explorer_on_focus", new RoamingProfileStorage("StackTraceExplorer.Options.OpenOnFocus")},
{"visual_studio_enable_document_outline", new RoamingProfileStorage(@"DocumentOutline.Enable")},
{"dotnet_enable_asynchronous_suggestions", new RoamingProfileStorage("TextEditor.Specific.Suggestions.Asynchronous4")},
{"dotnet_disable_asynchronous_quick_actions", new FeatureFlagStorage(@"Roslyn.AsynchronousQuickActionsDisable2")},
{"visual_studio_enable_symbol_search", new LocalUserProfileStorage(@"Roslyn\Features\SymbolSearch", "Enabled")},
{"dotnet_search_nuget_packages", new RoamingProfileStorage("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInNuGetPackages")},
{"dotnet_search_reference_assemblies", new RoamingProfileStorage("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInReferenceAssemblies")},
Expand Down
3 changes: 0 additions & 3 deletions src/VisualStudio/Core/Def/ServicesVSResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,9 +1813,6 @@ Additional information: {1}</value>
<data name="Run_code_analysis_in_separate_process_requires_restart" xml:space="preserve">
<value>Run code analysis in separate process (requires restart)</value>
</data>
<data name="Compute_Quick_Actions_asynchronously_experimental" xml:space="preserve">
<value>Compute Quick Actions asynchronously (experimental, requires restart)</value>
</data>
<data name="Quick_Actions" xml:space="preserve">
<value>Quick Actions</value>
</data>
Expand Down
5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,7 @@
Content="{x:Static local:AdvancedOptionPageStrings.Option_Add_missing_imports_on_paste}" />
</StackPanel>
</GroupBox>

<GroupBox x:Uid="QuickActionsBox"
Header="{x:Static local:AdvancedOptionPageStrings.Option_Quick_Actions}">
<StackPanel>
<CheckBox x:Name="ComputeQuickActionsAsynchronouslyExperimental"
Content="{x:Static local:AdvancedOptionPageStrings.Option_Compute_Quick_Actions_asynchronously_experimental}" />
</StackPanel>
</GroupBox>


<GroupBox x:Uid="HighlightingGroupBox"
Header="{x:Static local:AdvancedOptionPageStrings.Option_Highlighting}">
<StackPanel>
Expand Down
7 changes: 0 additions & 7 deletions src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
BindToOption(SuggestForTypesInNuGetPackages, SymbolSearchOptionsStorage.SearchNuGetPackages, LanguageNames.VisualBasic)
BindToOption(AddMissingImportsOnPaste, AddImportOnPasteOptionsStorage.AddImportsOnPaste, LanguageNames.VisualBasic)

' Quick Actions
BindToOption(ComputeQuickActionsAsynchronouslyExperimental, SuggestionsOptionsStorage.Asynchronous,
Function()
' If the option has Not been set by the user, check if the option is disabled from experimentation.
Return Not optionStore.GetOption(SuggestionsOptionsStorage.AsynchronousQuickActionsDisableFeatureFlag)
End Function)

' Highlighting
BindToOption(EnableHighlightReferences, ReferenceHighlightingOptionsStorage.ReferenceHighlighting, LanguageNames.VisualBasic)
BindToOption(EnableHighlightKeywords, KeywordHighlightingOptionsStorage.KeywordHighlighting, LanguageNames.VisualBasic)
Expand Down
3 changes: 0 additions & 3 deletions src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
Public ReadOnly Property Option_Quick_Actions As String =
ServicesVSResources.Quick_Actions

Public ReadOnly Property Option_Compute_Quick_Actions_asynchronously_experimental As String =
ServicesVSResources.Compute_Quick_Actions_asynchronously_experimental

Public ReadOnly Property Option_EnableOutlining As String =
BasicVSResources.Enter_outlining_mode_when_files_open

Expand Down
2 changes: 0 additions & 2 deletions src/Workspaces/CoreTest/Options/OptionSerializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Linq;
using Microsoft.CodeAnalysis.Completion;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Editor.Implementation.Suggestions;
using Microsoft.CodeAnalysis.Editor.InlineDiagnostics;
using Microsoft.CodeAnalysis.Editor.Shared.Options;
using Microsoft.CodeAnalysis.Host;
Expand All @@ -29,7 +28,6 @@ public void SerializationAndDeserializationForNullableBool([CombinatorialValues(
CompletionViewOptionsStorage.EnableArgumentCompletionSnippets,
FeatureOnOffOptions.OfferRemoveUnusedReferences,
InheritanceMarginOptionsStorage.ShowInheritanceMargin,
SuggestionsOptionsStorage.Asynchronous,
WorkspaceConfigurationOptionsStorage.EnableOpeningSourceGeneratedFilesInWorkspace,
SolutionCrawlerOptionsStorage.EnableDiagnosticsInSourceGeneratedFiles,
CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces,
Expand Down