Move Options and CodeStyle APIs to shared layer

src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs

@@ -8,13 +8,11 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Options;
 using Roslyn.Utilities;
 
 #if CODE_STYLE
-using Microsoft.CodeAnalysis.Internal.Options;
 using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions;
-#else
-using Microsoft.CodeAnalysis.Options;
 #endif
 
 namespace Microsoft.CodeAnalysis.CodeStyle

src/Analyzers/Core/Analyzers/Helpers/AnalyzerHelper.cs

@@ -4,18 +4,19 @@
 
 #nullable enable
 
+using Microsoft.CodeAnalysis.Options;
+
 #if CODE_STYLE
-using Microsoft.CodeAnalysis.Internal.Options;
+using TOption = Microsoft.CodeAnalysis.Options.IOption2;
 #else
-using System.Threading;
-using Microsoft.CodeAnalysis.Options;
+using TOption = Microsoft.CodeAnalysis.Options.IOption;
 #endif
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
     internal static partial class AnalyzerHelper
     {
-        public static T GetOption<T>(this SemanticModelAnalysisContext context, Option<T> option)
+        public static T GetOption<T>(this SemanticModelAnalysisContext context, Option2<T> option)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.SemanticModel.SyntaxTree;
@@ -24,7 +25,7 @@ public static T GetOption<T>(this SemanticModelAnalysisContext context, Option<T
             return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this SyntaxNodeAnalysisContext context, Option<T> option)
+        public static T GetOption<T>(this SyntaxNodeAnalysisContext context, Option2<T> option)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.Node.SyntaxTree;
@@ -33,7 +34,7 @@ public static T GetOption<T>(this SyntaxNodeAnalysisContext context, Option<T> o
             return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this SyntaxTreeAnalysisContext context, Option<T> option)
+        public static T GetOption<T>(this SyntaxTreeAnalysisContext context, Option2<T> option)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.Tree;
@@ -42,7 +43,7 @@ public static T GetOption<T>(this SyntaxTreeAnalysisContext context, Option<T> o
             return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this OperationAnalysisContext context, Option<T> option)
+        public static T GetOption<T>(this OperationAnalysisContext context, Option2<T> option)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.Operation.Syntax.SyntaxTree;
@@ -51,7 +52,7 @@ public static T GetOption<T>(this OperationAnalysisContext context, Option<T> op
             return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this SemanticModelAnalysisContext context, PerLanguageOption<T> option, string? language)
+        public static T GetOption<T>(this SemanticModelAnalysisContext context, PerLanguageOption2<T> option, string? language)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.SemanticModel.SyntaxTree;
@@ -60,7 +61,7 @@ public static T GetOption<T>(this SemanticModelAnalysisContext context, PerLangu
             return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this SyntaxNodeAnalysisContext context, PerLanguageOption<T> option, string? language)
+        public static T GetOption<T>(this SyntaxNodeAnalysisContext context, PerLanguageOption2<T> option, string? language)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.Node.SyntaxTree;
@@ -69,7 +70,7 @@ public static T GetOption<T>(this SyntaxNodeAnalysisContext context, PerLanguage
             return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this SyntaxTreeAnalysisContext context, PerLanguageOption<T> option, string? language)
+        public static T GetOption<T>(this SyntaxTreeAnalysisContext context, PerLanguageOption2<T> option, string? language)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.Tree;
@@ -78,7 +79,7 @@ public static T GetOption<T>(this SyntaxTreeAnalysisContext context, PerLanguage
             return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this OperationAnalysisContext context, PerLanguageOption<T> option, string? language)
+        public static T GetOption<T>(this OperationAnalysisContext context, PerLanguageOption2<T> option, string? language)
         {
             var analyzerOptions = context.Options;
             var syntaxTree = context.Operation.Syntax.SyntaxTree;
@@ -87,7 +88,7 @@ public static T GetOption<T>(this OperationAnalysisContext context, PerLanguageO
             return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
         }
 
-        public static bool TryGetEditorConfigOption<T>(this AnalyzerOptions analyzerOptions, IOption option, SyntaxTree syntaxTree, out T value)
+        public static bool TryGetEditorConfigOption<T>(this AnalyzerOptions analyzerOptions, TOption option, SyntaxTree syntaxTree, out T value)
         {
             var configOptions = analyzerOptions.AnalyzerConfigOptionsProvider.GetOptions(syntaxTree);
             return configOptions.TryGetEditorConfigOption(option, out value);

src/Analyzers/Core/Analyzers/IDEDiagnosticIdToOptionMappingHelper.cs

@@ -7,12 +7,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
-
-#if CODE_STYLE
-using Microsoft.CodeAnalysis.Internal.Options;
-#else
 using Microsoft.CodeAnalysis.Options;
-#endif
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
@@ -23,10 +18,10 @@ namespace Microsoft.CodeAnalysis.Diagnostics
     /// </summary>
     internal static class IDEDiagnosticIdToOptionMappingHelper
     {
-        private static readonly ConcurrentDictionary<string, ImmutableHashSet<IOption>> s_diagnosticIdToOptionMap = new ConcurrentDictionary<string, ImmutableHashSet<IOption>>();
-        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<string, ImmutableHashSet<IOption>>> s_diagnosticIdToLanguageSpecificOptionsMap = new ConcurrentDictionary<string, ConcurrentDictionary<string, ImmutableHashSet<IOption>>>();
+        private static readonly ConcurrentDictionary<string, ImmutableHashSet<IOption2>> s_diagnosticIdToOptionMap = new ConcurrentDictionary<string, ImmutableHashSet<IOption2>>();
+        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<string, ImmutableHashSet<IOption2>>> s_diagnosticIdToLanguageSpecificOptionsMap = new ConcurrentDictionary<string, ConcurrentDictionary<string, ImmutableHashSet<IOption2>>>();
 
-        public static bool TryGetMappedOptions(string diagnosticId, string language, out ImmutableHashSet<IOption> options)
+        public static bool TryGetMappedOptions(string diagnosticId, string language, out ImmutableHashSet<IOption2> options)
             => s_diagnosticIdToOptionMap.TryGetValue(diagnosticId, out options) ||
                (s_diagnosticIdToLanguageSpecificOptionsMap.TryGetValue(language, out var map) &&
                 map.TryGetValue(diagnosticId, out options));
@@ -36,7 +31,7 @@ public static void AddOptionMapping(string diagnosticId, ImmutableHashSet<IPerLa
             diagnosticId = diagnosticId ?? throw new ArgumentNullException(nameof(diagnosticId));
             perLanguageOptions = perLanguageOptions ?? throw new ArgumentNullException(nameof(perLanguageOptions));
 
-            var options = perLanguageOptions.Cast<IOption>().ToImmutableHashSet();
+            var options = perLanguageOptions.Cast<IOption2>().ToImmutableHashSet();
             AddOptionMapping(s_diagnosticIdToOptionMap, diagnosticId, options);
         }
         public static void AddOptionMapping(string diagnosticId, ImmutableHashSet<ILanguageSpecificOption> languageSpecificOptions, string language)
@@ -45,12 +40,12 @@ public static void AddOptionMapping(string diagnosticId, ImmutableHashSet<ILangu
             languageSpecificOptions = languageSpecificOptions ?? throw new ArgumentNullException(nameof(languageSpecificOptions));
             language = language ?? throw new ArgumentNullException(nameof(language));
 
-            var map = s_diagnosticIdToLanguageSpecificOptionsMap.GetOrAdd(language, _ => new ConcurrentDictionary<string, ImmutableHashSet<IOption>>());
-            var options = languageSpecificOptions.Cast<IOption>().ToImmutableHashSet();
+            var map = s_diagnosticIdToLanguageSpecificOptionsMap.GetOrAdd(language, _ => new ConcurrentDictionary<string, ImmutableHashSet<IOption2>>());
+            var options = languageSpecificOptions.Cast<IOption2>().ToImmutableHashSet();
             AddOptionMapping(map, diagnosticId, options);
         }
 
-        private static void AddOptionMapping(ConcurrentDictionary<string, ImmutableHashSet<IOption>> map, string diagnosticId, ImmutableHashSet<IOption> options)
+        private static void AddOptionMapping(ConcurrentDictionary<string, ImmutableHashSet<IOption2>> map, string diagnosticId, ImmutableHashSet<IOption2> options)
         {
             // Verify that the option is either being added for the first time, or the existing option is already the same.
             // Latter can happen in tests as we re-instantiate the analyzer for every test, which attempts to add the mapping every time.

src/Analyzers/Core/Analyzers/NamingStyle/NamingStyleDiagnosticAnalyzerBase.cs

@@ -7,18 +7,11 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.NamingStyles;
 using Microsoft.CodeAnalysis.Simplification;
 using Roslyn.Utilities;
 
-#if CODE_STYLE
-using Microsoft.CodeAnalysis.Internal.Options;
-#else
-using Microsoft.CodeAnalysis.Options;
-#endif
-
 namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     internal abstract class NamingStyleDiagnosticAnalyzerBase<TLanguageKindEnum>

src/Features/CSharp/Portable/Completion/CSharpCompletionOptions.cs

@@ -10,9 +10,9 @@ namespace Microsoft.CodeAnalysis.CSharp.Completion
     internal static class CSharpCompletionOptions
     {
         [Obsolete("This option is superceded by CompletionOptions.EnterKeyBehavior")]
-        public static readonly Option<bool> AddNewLineOnEnterAfterFullyTypedWord = new Option<bool>(nameof(CSharpCompletionOptions), nameof(AddNewLineOnEnterAfterFullyTypedWord), defaultValue: false);
+        public static readonly Option2<bool> AddNewLineOnEnterAfterFullyTypedWord = new Option2<bool>(nameof(CSharpCompletionOptions), nameof(AddNewLineOnEnterAfterFullyTypedWord), defaultValue: false);
 
         [Obsolete("This option is superceded by CompletionOptions.SnippetsBehavior")]
-        public static readonly Option<bool> IncludeSnippets = new Option<bool>(nameof(CSharpCompletionOptions), nameof(IncludeSnippets), defaultValue: true);
+        public static readonly Option2<bool> IncludeSnippets = new Option2<bool>(nameof(CSharpCompletionOptions), nameof(IncludeSnippets), defaultValue: true);
     }
 }

src/Features/Core/Portable/CodeStyle/AbstractCodeStyleProvider.Analysis.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Threading;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Options;
 
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
@@ -51,7 +50,7 @@ public sealed override DiagnosticAnalyzerCategory GetAnalyzerCategory()
         /// To that end, we don't let the subclass have direct access to the real <see
         /// cref="Diagnostics.AnalysisContext"/>. Instead, we pass this type to the subclass for it
         /// register with.  We then check if the registration should proceed given the <see
-        /// cref="CodeStyleOption{T}"/>
+        /// cref="CodeStyleOption2{T}"/>
         /// and the current <see cref="SyntaxTree"/> being processed.  If not, we don't do the
         /// actual registration.
         /// </summary>
@@ -73,29 +72,29 @@ public void RegisterCompilationStartAction(Action<Compilation, AnalysisContext>
                     c => analyze(c.Compilation, _this));
             }
 
-            public void RegisterCodeBlockAction(Action<CodeBlockAnalysisContext, CodeStyleOption<TOptionKind>> analyze)
+            public void RegisterCodeBlockAction(Action<CodeBlockAnalysisContext, CodeStyleOption2<TOptionKind>> analyze)
             {
                 var provider = _codeStyleProvider;
                 _context.RegisterCodeBlockAction(
                     c => AnalyzeIfEnabled(provider, c, analyze, c.Options, c.SemanticModel.SyntaxTree, c.CancellationToken));
             }
 
-            public void RegisterSemanticModelAction(Action<SemanticModelAnalysisContext, CodeStyleOption<TOptionKind>> analyze)
+            public void RegisterSemanticModelAction(Action<SemanticModelAnalysisContext, CodeStyleOption2<TOptionKind>> analyze)
             {
                 var provider = _codeStyleProvider;
                 _context.RegisterSemanticModelAction(
                     c => AnalyzeIfEnabled(provider, c, analyze, c.Options, c.SemanticModel.SyntaxTree, c.CancellationToken));
             }
 
-            public void RegisterSyntaxTreeAction(Action<SyntaxTreeAnalysisContext, CodeStyleOption<TOptionKind>> analyze)
+            public void RegisterSyntaxTreeAction(Action<SyntaxTreeAnalysisContext, CodeStyleOption2<TOptionKind>> analyze)
             {
                 var provider = _codeStyleProvider;
                 _context.RegisterSyntaxTreeAction(
                     c => AnalyzeIfEnabled(provider, c, analyze, c.Options, c.Tree, c.CancellationToken));
             }
 
             public void RegisterOperationAction(
-                Action<OperationAnalysisContext, CodeStyleOption<TOptionKind>> analyze,
+                Action<OperationAnalysisContext, CodeStyleOption2<TOptionKind>> analyze,
                 params OperationKind[] operationKinds)
             {
                 var provider = _codeStyleProvider;
@@ -105,7 +104,7 @@ public void RegisterOperationAction(
             }
 
             public void RegisterSyntaxNodeAction<TSyntaxKind>(
-                Action<SyntaxNodeAnalysisContext, CodeStyleOption<TOptionKind>> analyze,
+                Action<SyntaxNodeAnalysisContext, CodeStyleOption2<TOptionKind>> analyze,
                 params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct
             {
                 var provider = _codeStyleProvider;
@@ -115,7 +114,7 @@ public void RegisterSyntaxNodeAction<TSyntaxKind>(
             }
 
             private static void AnalyzeIfEnabled<TContext>(
-                TCodeStyleProvider provider, TContext context, Action<TContext, CodeStyleOption<TOptionKind>> analyze,
+                TCodeStyleProvider provider, TContext context, Action<TContext, CodeStyleOption2<TOptionKind>> analyze,
                 AnalyzerOptions options, SyntaxTree syntaxTree, CancellationToken cancellationToken)
             {
                 var optionValue = options.GetOption(provider._option, syntaxTree, cancellationToken);

src/Features/Core/Portable/CodeStyle/AbstractCodeStyleProvider.cs

@@ -33,14 +33,14 @@ internal abstract partial class AbstractCodeStyleProvider<
         TOptionKind, TCodeStyleProvider>
         where TCodeStyleProvider : AbstractCodeStyleProvider<TOptionKind, TCodeStyleProvider>, new()
     {
-        private readonly Option<CodeStyleOption<TOptionKind>> _option;
+        private readonly Option2<CodeStyleOption2<TOptionKind>> _option;
         private readonly string _language;
         private readonly string _descriptorId;
         private readonly LocalizableString _title;
         private readonly LocalizableString _message;
 
         protected AbstractCodeStyleProvider(
-            Option<CodeStyleOption<TOptionKind>> option,
+            Option2<CodeStyleOption2<TOptionKind>> option,
             string language,
             string descriptorId,
             LocalizableString title,
@@ -58,7 +58,7 @@ protected AbstractCodeStyleProvider(
         /// handle ReportDiagnostic.Default and will map that back to the appropriate value in that
         /// case.
         /// </summary>
-        protected static ReportDiagnostic GetOptionSeverity(CodeStyleOption<TOptionKind> optionValue)
+        protected static ReportDiagnostic GetOptionSeverity(CodeStyleOption2<TOptionKind> optionValue)
         {
             var severity = optionValue.Notification.Severity;
             return severity == ReportDiagnostic.Default