Rename options to editorconfig like name

src/EditorFeatures/CSharp/EventHookup/EventHookupCommandHandler_TabKeyCommand.cs

@@ -17,6 +17,7 @@
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
+using Microsoft.CodeAnalysis.EventHookup;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.LanguageService;
@@ -39,7 +40,7 @@ internal partial class EventHookupCommandHandler : IChainedCommandHandler<TabKey
         public void ExecuteCommand(TabKeyCommandArgs args, Action nextHandler, CommandExecutionContext context)
         {
             _threadingContext.ThrowIfNotOnUIThread();
-            if (!_globalOptions.GetOption(InternalFeatureOnOffOptions.EventHookup))
+            if (!_globalOptions.GetOption(EventHookupOptionsStorage.EventHookup))
             {
                 nextHandler();
                 return;

src/EditorFeatures/CSharp/EventHookup/EventHookupCommandHandler_TypeCharCommand.cs

@@ -7,13 +7,12 @@
 using System;
 using System.Threading;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
-using Microsoft.CodeAnalysis.Editor.Shared.Options;
+using Microsoft.CodeAnalysis.EventHookup;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.VisualStudio.Commanding;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.EventHookup
 {
@@ -24,7 +23,7 @@ public void ExecuteCommand(TypeCharCommandArgs args, Action nextHandler, Command
             _threadingContext.ThrowIfNotOnUIThread();
             nextHandler();
 
-            if (!_globalOptions.GetOption(InternalFeatureOnOffOptions.EventHookup))
+            if (!_globalOptions.GetOption(EventHookupOptionsStorage.EventHookup))
             {
                 EventHookupSessionManager.CancelAndDismissExistingSessions();
                 return;

src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs

@@ -54,8 +54,10 @@ public bool ExecuteCommand(ReturnKeyCommandArgs args, CommandExecutionContext co
 
         public bool ExecuteCommandWorker(ReturnKeyCommandArgs args, CancellationToken cancellationToken)
         {
-            if (!_editorOptionsService.GlobalOptions.GetOption(SplitStringLiteralOptions.Enabled))
+            if (!_editorOptionsService.GlobalOptions.GetOption(SplitStringLiteralOptionsStorage.Enabled))
+            {
                 return false;
+            }
 
             var textView = args.TextView;
             var subjectBuffer = args.SubjectBuffer;

src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralOptions.cs → src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralOptionsStorage.cs

@@ -6,7 +6,7 @@
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.SplitStringLiteral;
 
-internal sealed class SplitStringLiteralOptions
+internal sealed class SplitStringLiteralOptionsStorage
 {
-    public static Option2<bool> Enabled = new("SplitStringLiteralOptions_Enabled", defaultValue: true);
+    public static Option2<bool> Enabled = new("csharp_split_string_literal_on_return", defaultValue: true);
 }

src/EditorFeatures/CSharpTest/InlineDiagnostics/InlineDiagnosticsTaggerProviderTests.cs

@@ -57,7 +57,7 @@ private static async Task<ImmutableArray<ITagSpan<InlineDiagnosticsTag>>> GetTag
 
         private static async Task<ImmutableArray<ITagSpan<InlineDiagnosticsTag>>> GetTagSpansAsync(TestWorkspace workspace)
         {
-            workspace.GlobalOptions.SetGlobalOption(InlineDiagnosticsOptions.EnableInlineDiagnostics, LanguageNames.CSharp, true);
+            workspace.GlobalOptions.SetGlobalOption(InlineDiagnosticsOptionsStorage.EnableInlineDiagnostics, LanguageNames.CSharp, true);
             return (await TestDiagnosticTagProducer<InlineDiagnosticsTaggerProvider, InlineDiagnosticsTag>.GetDiagnosticsAndErrorSpans(workspace)).Item2;
         }
     }

src/EditorFeatures/CSharpTest/Squiggles/ErrorSquiggleProducerTests.cs

@@ -81,7 +81,7 @@ void Test()
 </Workspace>";
 
             using var workspace = TestWorkspace.Create(workspaceXml);
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             var spans = (await TestDiagnosticTagProducer<DiagnosticsSquiggleTaggerProvider, IErrorTag>.GetDiagnosticsAndErrorSpans(workspace)).Item2;
 
@@ -117,7 +117,7 @@ void Test()
             using var workspace = TestWorkspace.Create(workspaceXml, composition: SquiggleUtilities.CompositionWithSolutionCrawler);
             var language = workspace.Projects.Single().Language;
 
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             workspace.GlobalOptions.SetGlobalOption(
                 CodeStyleOptions2.PreferIntrinsicPredefinedTypeKeywordInDeclaration, language,
@@ -212,7 +212,7 @@ public async Task SemanticErrorReported(bool pull)
         {
             using var workspace = TestWorkspace.CreateCSharp("class C : Bar { }", composition: SquiggleUtilities.CompositionWithSolutionCrawler);
 
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             var spans = await TestDiagnosticTagProducer<DiagnosticsSquiggleTaggerProvider, IErrorTag>.GetDiagnosticsAndErrorSpans(workspace);
 
@@ -237,7 +237,7 @@ public async Task SemanticErrorReported(bool pull)
         public async Task TestNoErrorsAfterDocumentRemoved(bool pull)
         {
             using var workspace = TestWorkspace.CreateCSharp("class");
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             using var wrapper = new DiagnosticTaggerWrapper<DiagnosticsSquiggleTaggerProvider, IErrorTag>(workspace);
 
@@ -267,7 +267,7 @@ public async Task TestNoErrorsAfterDocumentRemoved(bool pull)
         public async Task TestNoErrorsAfterProjectRemoved(bool pull)
         {
             using var workspace = TestWorkspace.CreateCSharp("class");
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             using var wrapper = new DiagnosticTaggerWrapper<DiagnosticsSquiggleTaggerProvider, IErrorTag>(workspace);
 
@@ -313,7 +313,7 @@ class Test
 </Workspace>";
 
             using var workspace = TestWorkspace.Create(workspaceXml, composition: s_mockComposition);
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             var document = workspace.Documents.First();
 
@@ -357,7 +357,7 @@ class Test
 </Workspace>";
 
             using var workspace = TestWorkspace.Create(workspaceXml, composition: s_mockComposition);
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             var document = workspace.Documents.First();
 
@@ -401,7 +401,7 @@ private static async Task<ImmutableArray<ITagSpan<IErrorTag>>> GetTagSpansInSour
 
         private static async Task<ImmutableArray<ITagSpan<IErrorTag>>> GetTagSpansAsync(TestWorkspace workspace, bool pull)
         {
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             return (await TestDiagnosticTagProducer<DiagnosticsSquiggleTaggerProvider, IErrorTag>.GetDiagnosticsAndErrorSpans(workspace)).Item2;
         }

src/EditorFeatures/CSharpTest/SuggestionTags/SuggestionTagProducerTests.cs

@@ -44,7 +44,7 @@ void M() {
             string content, bool pull)
         {
             using var workspace = TestWorkspace.CreateCSharp(content);
-            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptions.PullDiagnosticTagging, pull);
+            workspace.GlobalOptions.SetGlobalOption(DiagnosticTaggingOptionsStorage.PullDiagnosticTagging, pull);
 
             var analyzerMap = new Dictionary<string, ImmutableArray<DiagnosticAnalyzer>>()
             {

src/EditorFeatures/Core.Cocoa/Options/VisualStudioMacOptionsStorage.cs

@@ -56,22 +56,22 @@ public string GetName(string? language)
     /// </summary>
     public static readonly IReadOnlyDictionary<string, PropertyName> PersistedOptionsWithLegacyPropertyNames = new Dictionary<string, PropertyName>()
     {
-        {"BraceCompletionOptions_AutoFormattingOnCloseBrace", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Close Brace")},
-        {"FormattingOptions_AutoFormattingOnReturn", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Return")},
-        {"FormattingOptions_AutoFormattingOnSemicolon", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Semicolon")},
-        {"FormattingOptions_AutoFormattingOnTyping", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Typing")},
-        {"FormattingOptions_FormatOnPaste", new PropertyName("TextEditor.%LANGUAGE%.SpeciAddImportsOnPaste2fic.FormatOnPaste")},
+        {"csharp_format_on_close_brace", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Close Brace")},
+        {"csharp_format_on_return", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Return")},
+        {"csharp_format_on_semicolon", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Semicolon")},
+        {"csharp_format_on_typing", new PropertyName("TextEditor.%LANGUAGE%.Specific.Auto Formatting On Typing")},
+        {"dotnet_format_on_paste", new PropertyName("TextEditor.%LANGUAGE%.SpeciAddImportsOnPaste2fic.FormatOnPaste")},
         {"dotnet_sort_system_directives_first", new PropertyName("TextEditor.%LANGUAGE%.Specific.PlaceSystemNamespaceFirst")},
         {"dotnet_separate_import_directive_groups", new PropertyName("TextEditor.%LANGUAGE%.Specific.SeparateImportDirectiveGroups")},
-        {"QuickInfoOptions_ShowRemarksInQuickInfo", new PropertyName("TextEditor.%LANGUAGE%.Specific.ShowRemarks")},
+        {"dotnet_show_remarks_in_quick_info", new PropertyName("TextEditor.%LANGUAGE%.Specific.ShowRemarks")},
         {"dotnet_add_imports_on_paste", new PropertyName("TextEditor.%LANGUAGE%.Specific.AddImportsOnPaste2")},
-        {"CompletionOptions_ShowItemsFromUnimportedNamespaces", new PropertyName("TextEditor.%LANGUAGE%.Specific.ShowItemsFromUnimportedNamespaces")},
-        {"CompletionOptions_TriggerOnDeletion", new PropertyName("TextEditor.%LANGUAGE%.Specific.TriggerOnDeletion")},
-        {"CompletionOptions_TriggerOnTypingLetters", new PropertyName("TextEditor.%LANGUAGE%.Specific.TriggerOnTypingLetters")},
-        {"CompletionOptions_ShowCompletionItemFilters", new PropertyName("TextEditor.%LANGUAGE%.Specific.ShowCompletionItemFilters")},
-        {"SolutionCrawlerOptionsStorage_BackgroundAnalysisScopeOption", new PropertyName("TextEditor.%LANGUAGE%.Specific.BackgroundAnalysisScopeOption")},
-        {"SolutionCrawlerOptionsStorage_CompilerDiagnosticsScopeOption", new PropertyName("TextEditor.%LANGUAGE%.Specific.CompilerDiagnosticsScopeOption")},
-        {"SymbolSearchOptions_SuggestForTypesInNuGetPackages", new PropertyName("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInNuGetPackages")},
+        {"dotnet_show_completion_items_from_unimported_namespaces", new PropertyName("TextEditor.%LANGUAGE%.Specific.ShowItemsFromUnimportedNamespaces")},
+        {"dotnet_trigger_completion_on_deletion", new PropertyName("TextEditor.%LANGUAGE%.Specific.TriggerOnDeletion")},
+        {"dotnet_trigger_completion_on_typing_letters", new PropertyName("TextEditor.%LANGUAGE%.Specific.TriggerOnTypingLetters")},
+        {"dotnet_show_completion_item_filters", new PropertyName("TextEditor.%LANGUAGE%.Specific.ShowCompletionItemFilters")},
+        {"dotnet_solution_crawler_background_analysis_scope", new PropertyName("TextEditor.%LANGUAGE%.Specific.BackgroundAnalysisScopeOption")},
+        {"dotnet_compiler_diagnostics_scope", new PropertyName("TextEditor.%LANGUAGE%.Specific.CompilerDiagnosticsScopeOption")},
+        {"dotnet_search_nuget_packages", new PropertyName("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInNuGetPackages")},
         {"csharp_complete_statement_on_semicolon", new PropertyName("TextEditor.AutomaticallyCompleteStatementOnSemicolon")},
     };
 }

src/EditorFeatures/Core.Cocoa/Snippets/AbstractSnippetCommandHandler.cs

@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.LanguageService;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Snippets;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Commanding;
 using Microsoft.VisualStudio.Text;
@@ -290,7 +291,7 @@ protected bool TryHandleTypedSnippet(ITextView textView, ITextBuffer subjectBuff
 
         protected bool AreSnippetsEnabled(EditorCommandArgs args)
         {
-            return EditorOptionsService.GlobalOptions.GetOption(InternalFeatureOnOffOptions.Snippets) &&
+            return EditorOptionsService.GlobalOptions.GetOption(SnippetsOptionsStorage.Snippets) &&
                 // TODO (https://github.com/dotnet/roslyn/issues/5107): enable in interactive
                 !(Workspace.TryGetWorkspace(args.SubjectBuffer.AsTextContainer(), out var workspace) && workspace.Kind == WorkspaceKind.Interactive);
         }

src/EditorFeatures/Core.Wpf/InlineDiagnostics/InlineDiagnosticsAdornmentManager.cs

@@ -69,7 +69,7 @@ private void TextView_ViewportWidthChanged(object sender, EventArgs e)
                 return;
             }
 
-            var option = _globalOptions.GetOption(InlineDiagnosticsOptions.Location, document.Project.Language);
+            var option = _globalOptions.GetOption(InlineDiagnosticsOptionsStorage.Location, document.Project.Language);
             if (option == InlineDiagnosticsLocations.PlacedAtEndOfEditor)
             {
                 var normalizedCollectionSpan = new NormalizedSnapshotSpanCollection(TextView.TextViewLines.FormattedSpan);

src/EditorFeatures/Core.Wpf/InlineDiagnostics/InlineDiagnosticsTaggerProvider.cs

@@ -35,8 +35,8 @@ internal sealed class InlineDiagnosticsTaggerProvider : AbstractDiagnosticsAdorn
         private readonly IClassificationFormatMapService _classificationFormatMapService;
         private readonly IClassificationTypeRegistryService _classificationTypeRegistryService;
 
-        protected sealed override ImmutableArray<IOption2> Options { get; } = ImmutableArray.Create<IOption2>(InlineDiagnosticsOptions.EnableInlineDiagnostics);
-        protected sealed override ImmutableArray<IOption2> FeatureOptions { get; } = ImmutableArray.Create<IOption2>(InlineDiagnosticsOptions.Location);
+        protected sealed override ImmutableArray<IOption2> Options { get; } = ImmutableArray.Create<IOption2>(InlineDiagnosticsOptionsStorage.EnableInlineDiagnostics);
+        protected sealed override ImmutableArray<IOption2> FeatureOptions { get; } = ImmutableArray.Create<IOption2>(InlineDiagnosticsOptionsStorage.Location);
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
@@ -91,7 +91,7 @@ diagnostic.Severity is DiagnosticSeverity.Warning or DiagnosticSeverity.Error &&
                 return null;
             }
 
-            var locationOption = GlobalOptions.GetOption(InlineDiagnosticsOptions.Location, project.Language);
+            var locationOption = GlobalOptions.GetOption(InlineDiagnosticsOptionsStorage.Location, project.Language);
             var navigateService = workspace.Services.GetRequiredService<INavigateToLinkService>();
             return new InlineDiagnosticsTag(errorType, diagnostic, _editorFormatMap, _classificationFormatMapService,
                 _classificationTypeRegistryService, locationOption, navigateService);

src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsKeyProcessorProvider.cs

@@ -115,7 +115,7 @@ private void Toggle(bool on)
 
                 // We can only enter the on-state if the user has the chord feature enabled.  We can always enter the
                 // off state though.
-                on = on && _globalOptions.GetOption(InlineHintsViewOptions.DisplayAllHintsWhilePressingAltF1);
+                on = on && _globalOptions.GetOption(InlineHintsViewOptionsStorage.DisplayAllHintsWhilePressingAltF1);
                 _globalOptions.RefreshOption(new OptionKey2(InlineHintsGlobalStateOption.DisplayAllOverride), on);
             }
         }

src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTagger.cs

@@ -167,7 +167,7 @@ public IEnumerable<ITagSpan<IntraTextAdornmentTag>> GetTags(NormalizedSnapshotSp
                 }
 
                 var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
-                var classify = document != null && _taggerProvider.EditorOptionsService.GlobalOptions.GetOption(InlineHintsViewOptions.ColorHints, document.Project.Language);
+                var classify = document != null && _taggerProvider.EditorOptionsService.GlobalOptions.GetOption(InlineHintsViewOptionsStorage.ColorHints, document.Project.Language);
 
                 var selectedSpans = new List<ITagSpan<IntraTextAdornmentTag>>();
                 for (var i = 0; i < _cache.Count; i++)

src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsViewOptions.cs → src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsViewOptionsStorage.cs

@@ -6,12 +6,12 @@
 
 namespace Microsoft.CodeAnalysis.Editor.InlineHints
 {
-    internal sealed class InlineHintsViewOptions
+    internal sealed class InlineHintsViewOptionsStorage
     {
         public static readonly Option2<bool> DisplayAllHintsWhilePressingAltF1 = new(
-            "InlineHintsOptions_DisplayAllHintsWhilePressingAltF1", defaultValue: true);
+            "dotnet_display_inline_hints_while_pressing_alt_f1", defaultValue: true);
 
         public static readonly PerLanguageOption2<bool> ColorHints = new(
-            "InlineHintsOptions_ColorHints", defaultValue: true);
+            "dotnet_colorize_inline_hints", defaultValue: true);
     }
 }

src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyoutViewModel.cs

@@ -165,12 +165,12 @@ public bool RenameOverloadsFlag
 
         public bool IsCollapsed
         {
-            get => _globalOptionService.GetOption(InlineRenameUIOptions.CollapseUI);
+            get => _globalOptionService.GetOption(InlineRenameUIOptionsStorage.CollapseUI);
             set
             {
                 if (value != IsCollapsed)
                 {
-                    _globalOptionService.SetGlobalOption(InlineRenameUIOptions.CollapseUI, value);
+                    _globalOptionService.SetGlobalOption(InlineRenameUIOptionsStorage.CollapseUI, value);
                     NotifyPropertyChanged(nameof(IsCollapsed));
                     NotifyPropertyChanged(nameof(IsExpanded));
                 }

src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs

@@ -105,7 +105,7 @@ private void UpdateAdornments()
                 return null;
             }
 
-            var useInlineAdornment = _globalOptionService.GetOption(InlineRenameUIOptions.UseInlineAdornment);
+            var useInlineAdornment = _globalOptionService.GetOption(InlineRenameUIOptionsStorage.UseInlineAdornment);
             if (useInlineAdornment)
             {
                 if (!_textView.HasAggregateFocus)

src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs

@@ -98,7 +98,7 @@ public SuggestedActionsSourceProvider(
 
             // 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(SuggestionsOptions.Asynchronous) is bool b ? b : !_globalOptions.GetOption(SuggestionsOptions.AsynchronousQuickActionsDisableFeatureFlag);
+            var asyncEnabled = _globalOptions.GetOption(SuggestionsOptionsStorage.Asynchronous) is bool b ? b : !_globalOptions.GetOption(SuggestionsOptionsStorage.AsynchronousQuickActionsDisableFeatureFlag);
 
             return asyncEnabled
                 ? new AsyncSuggestedActionsSource(_threadingContext, _globalOptions, this, textView, textBuffer, _suggestedActionCategoryRegistry)