Move VS layer and some of the options it depends on to the new intern…

…al API
dotnet · Mar 10, 2020 · 6e1e5dd · 6e1e5dd
1 parent 00b3593
commit 6e1e5dd
Show file tree

Hide file tree

Showing 22 changed files with 273 additions and 256 deletions.
diff --git a/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralOptions.cs b/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralOptions.cs
@@ -13,8 +13,8 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.SplitStringLiteral
 {
     internal class SplitStringLiteralOptions
     {
-        public static PerLanguageOption<bool> Enabled =
-            new PerLanguageOption<bool>(nameof(SplitStringLiteralOptions), nameof(Enabled), defaultValue: true,
+        public static PerLanguageOption2<bool> Enabled =
+            new PerLanguageOption2<bool>(nameof(SplitStringLiteralOptions), nameof(Enabled), defaultValue: true,
                 storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.SplitStringLiterals"));
     }
 

diff --git a/src/EditorFeatures/Core/Options/ColorSchemeOptions.cs b/src/EditorFeatures/Core/Options/ColorSchemeOptions.cs
@@ -12,12 +12,12 @@ internal static class ColorSchemeOptions
     {
         internal const string ColorSchemeSettingKey = "TextEditor.Roslyn.ColorScheme";
 
-        public static readonly Option<SchemeName> ColorScheme = new Option<SchemeName>(nameof(ColorSchemeOptions),
+        public static readonly Option2<SchemeName> ColorScheme = new Option2<SchemeName>(nameof(ColorSchemeOptions),
             nameof(ColorScheme),
             defaultValue: SchemeName.VisualStudio2019,
             storageLocations: new RoamingProfileStorageLocation(ColorSchemeSettingKey));
 
-        public static readonly Option<UseEnhancedColors> LegacyUseEnhancedColors = new Option<UseEnhancedColors>(nameof(ColorSchemeOptions),
+        public static readonly Option2<UseEnhancedColors> LegacyUseEnhancedColors = new Option2<UseEnhancedColors>(nameof(ColorSchemeOptions),
             nameof(LegacyUseEnhancedColors),
             defaultValue: UseEnhancedColors.Default,
             storageLocations: new RoamingProfileStorageLocation("WindowManagement.Options.UseEnhancedColorsForManagedLanguages"));

diff --git a/src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs b/src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs
@@ -79,16 +79,16 @@ internal static class FeatureOnOffOptions
         public static readonly PerLanguageOption2<bool> StreamingGoToImplementation = new PerLanguageOption2<bool>(
             nameof(FeatureOnOffOptions), nameof(StreamingGoToImplementation), defaultValue: true);
 
-        public static readonly Option<bool> NavigateToDecompiledSources = new Option<bool>(
+        public static readonly Option2<bool> NavigateToDecompiledSources = new Option2<bool>(
             nameof(FeatureOnOffOptions), nameof(NavigateToDecompiledSources), defaultValue: false,
             storageLocations: new RoamingProfileStorageLocation($"TextEditor.{nameof(NavigateToDecompiledSources)}"));
 
-        public static readonly Option<int> UseEnhancedColors = new Option<int>(
+        public static readonly Option2<int> UseEnhancedColors = new Option2<int>(
             nameof(FeatureOnOffOptions), nameof(UseEnhancedColors), defaultValue: 1,
             storageLocations: new RoamingProfileStorageLocation("WindowManagement.Options.UseEnhancedColorsForManagedLanguages"));
 
         // Note: no storage location since this is intentionally a session variable
-        public static readonly Option<bool> AcceptedDecompilerDisclaimer = new Option<bool>(
+        public static readonly Option2<bool> AcceptedDecompilerDisclaimer = new Option2<bool>(
             nameof(FeatureOnOffOptions), nameof(AcceptedDecompilerDisclaimer), defaultValue: false);
     }
 

diff --git a/src/VisualStudio/CSharp/Impl/Options/AutomationObject.cs b/src/VisualStudio/CSharp/Impl/Options/AutomationObject.cs
diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/CodeStylePage.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/CodeStylePage.cs
@@ -32,8 +32,8 @@ protected override AbstractOptionPageControl CreateOptionPage(IServiceProvider s
         {
             var builder = ArrayBuilder<(string, ImmutableArray<IOption>)>.GetInstance();
             builder.AddRange(GridOptionPreviewControl.GetLanguageAgnosticEditorConfigOptions());
-            builder.Add((CSharpVSResources.CSharp_Coding_Conventions, CSharpCodeStyleOptions.AllOptions));
-            builder.Add((CSharpVSResources.CSharp_Formatting_Rules, CSharpFormattingOptions.AllOptions));
+            builder.Add((CSharpVSResources.CSharp_Coding_Conventions, CSharpCodeStyleOptions.AllOptions.As<IOption>()));
+            builder.Add((CSharpVSResources.CSharp_Formatting_Rules, CSharpFormattingOptions2.AllOptions.As<IOption>()));
             return builder.ToImmutableAndFree();
         }
 

diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs
@@ -34,7 +34,7 @@ public FormattingOptionPageControl(OptionStore optionStore) : base(optionStore)
             BindToOption(FormatWhenTypingCheckBox, FeatureOnOffOptions.AutoFormattingOnTyping, LanguageNames.CSharp);
             BindToOption(FormatOnCloseBraceCheckBox, FeatureOnOffOptions.AutoFormattingOnCloseBrace, LanguageNames.CSharp);
             BindToOption(FormatOnSemicolonCheckBox, FeatureOnOffOptions.AutoFormattingOnSemicolon, LanguageNames.CSharp);
-            BindToOption(FormatOnReturnCheckBox, FormattingOptions.AutoFormattingOnReturn, LanguageNames.CSharp);
+            BindToOption(FormatOnReturnCheckBox, FormattingOptions2.AutoFormattingOnReturn, LanguageNames.CSharp);
             BindToOption(FormatOnPasteCheckBox, FeatureOnOffOptions.FormatOnPaste, LanguageNames.CSharp);
         }
     }