Precursor to share code with RoslynAnalyzers.

src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj

@@ -35,7 +35,6 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Formatting\VisualBasic\VisualBasicSyntaxFormattingOptions.cs" Link="Formatting\VisualBasic\VisualBasicSyntaxFormattingOptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="CodeStyleResources.resx" GenerateSource="true" />

src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj

@@ -6,6 +6,7 @@
     <RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetRoslynSourceBuild);netstandard2.0</TargetFrameworks>
+    <DefineConstants>$(DefineConstants);CSHARP_WORKSPACE</DefineConstants>
     <ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">full</ApplyNgenOptimization>
 
     <!-- NuGet -->
@@ -47,6 +48,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
     <InternalsVisibleTo Include="IdeCoreBenchmarks" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Workspaces.Test.Utilities"/>
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.New.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.Completion.Tests" Key="$(IntelliCodeCSharpKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35081" />
     <InternalsVisibleTo Include="AITools.CodeAnalysis" Key="$(AIToolsKey)" />

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/CodeGeneration/CSharpSyntaxTokens.cs

@@ -32,7 +32,9 @@ internal static class CSharpSyntaxTokens
     public static readonly SyntaxToken EndOfDocumentationCommentToken = Token(SyntaxKind.EndOfDocumentationCommentToken);
     public static readonly SyntaxToken EqualsToken = Token(SyntaxKind.EqualsToken);
     public static readonly SyntaxToken ExplicitKeyword = Token(SyntaxKind.ExplicitKeyword);
+#if !ROSLYN_4_12_OR_LOWER
     public static readonly SyntaxToken ExtensionKeyword = Token(SyntaxKind.ExtensionKeyword);
+#endif
     public static readonly SyntaxToken ExternKeyword = Token(SyntaxKind.ExternKeyword);
     public static readonly SyntaxToken FileKeyword = Token(SyntaxKind.FileKeyword);
     public static readonly SyntaxToken FixedKeyword = Token(SyntaxKind.FixedKeyword);

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/CodeStyle/PreferBracesPreference.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
+
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/MemberDeclarationSyntaxExtensions.cs

@@ -32,7 +32,9 @@ public static SyntaxToken GetNameToken(this MemberDeclarationSyntax member)
                 case SyntaxKind.EnumDeclaration:
                     return ((EnumDeclarationSyntax)member).Identifier;
                 case SyntaxKind.ClassDeclaration:
+#if !ROSLYN_4_12_OR_LOWER
                 case SyntaxKind.ExtensionBlockDeclaration:
+#endif
                 case SyntaxKind.InterfaceDeclaration:
                 case SyntaxKind.RecordDeclaration:
                 case SyntaxKind.RecordStructDeclaration:
@@ -72,7 +74,9 @@ public static int GetArity(this MemberDeclarationSyntax member)
             switch (member.Kind())
             {
                 case SyntaxKind.ClassDeclaration:
+#if !ROSLYN_4_12_OR_LOWER
                 case SyntaxKind.ExtensionBlockDeclaration:
+#endif
                 case SyntaxKind.InterfaceDeclaration:
                 case SyntaxKind.RecordDeclaration:
                 case SyntaxKind.RecordStructDeclaration:
@@ -97,7 +101,9 @@ public static int GetArity(this MemberDeclarationSyntax member)
             switch (member.Kind())
             {
                 case SyntaxKind.ClassDeclaration:
+#if !ROSLYN_4_12_OR_LOWER
                 case SyntaxKind.ExtensionBlockDeclaration:
+#endif
                 case SyntaxKind.InterfaceDeclaration:
                 case SyntaxKind.RecordDeclaration:
                 case SyntaxKind.RecordStructDeclaration:

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxNodeExtensions.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
+
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs

@@ -8,10 +8,6 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Formatting;
 
-#if CODE_STYLE
-using CSharpWorkspaceResources = Microsoft.CodeAnalysis.CSharp.CSharpCodeStyleResources;
-#endif
-
 namespace Microsoft.CodeAnalysis.CSharp.Formatting;
 
 internal static partial class CSharpFormattingOptions2

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/Rules/TokenBasedFormattingRule.cs

@@ -338,9 +338,11 @@ is SyntaxKind.IdentifierToken
                     or SyntaxKind.DefaultKeyword
                     or SyntaxKind.BaseKeyword
                     or SyntaxKind.ThisKeyword
-                    or SyntaxKind.ExtensionKeyword ||
-                previousToken.IsGenericGreaterThanToken() ||
-                currentToken.IsParenInArgumentList())
+#if !ROSLYN_4_12_OR_LOWER
+                    or SyntaxKind.ExtensionKeyword
+#endif
+                || previousToken.IsGenericGreaterThanToken()
+                || currentToken.IsParenInArgumentList())
             {
                 return CreateAdjustSpacesOperation(0, AdjustSpacesOption.ForceSpacesIfOnSingleLine);
             }

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SemanticFacts/CSharpSemanticFacts.cs

@@ -405,7 +405,11 @@ IdentifierNameSyntax nameSyntax when IsInPreprocessingSymbolContext(nameSyntax)
         };
 
     private static IPreprocessingSymbol? CreatePreprocessingSymbol(SemanticModel model, SyntaxToken identifier)
+#if !ROSLYN_4_12_OR_LOWER
         => model.Compilation.CreatePreprocessingSymbol(identifier.ValueText);
+#else
+        => null;
+#endif
 
     private static bool IsInPreprocessingSymbolContext(SyntaxNode node)
         => node.Ancestors().Any(n => n.Kind() is
@@ -417,7 +421,7 @@ SyntaxKind.DefineDirectiveTrivia or
     public bool TryGetPrimaryConstructor(INamedTypeSymbol typeSymbol, [NotNullWhen(true)] out IMethodSymbol? primaryConstructor)
         => typeSymbol.TryGetPrimaryConstructor(out primaryConstructor);
 
-#if !CODE_STYLE
+#if CSHARP_WORKSPACE
 
     public async Task<ISymbol?> GetInterceptorSymbolAsync(Document document, int position, CancellationToken cancellationToken)
     {

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxFacts.cs

@@ -836,6 +836,7 @@ public string GetDisplayName(SyntaxNode? node, DisplayNameOptions options, strin
 
                 return builder.ToString();
             }
+#if !ROSLYN_4_12_OR_LOWER
             else if (memberDeclaration is ExtensionBlockDeclarationSyntax extensionDeclaration)
             {
                 using var _ = PooledStringBuilder.GetInstance(out var builder);
@@ -847,6 +848,7 @@ public string GetDisplayName(SyntaxNode? node, DisplayNameOptions options, strin
                 AppendParameterList(builder, extensionDeclaration.ParameterList);
                 return builder.ToString();
             }
+#endif
             else
             {
                 Debug.Assert(memberDeclaration.Kind() == SyntaxKind.IncompleteMember);
@@ -872,6 +874,7 @@ static void AppendTypeParameterList(StringBuilder builder, TypeParameterListSynt
             }
         }
 
+#if !ROSLYN_4_12_OR_LOWER
         void AppendParameterList(StringBuilder builder, ParameterListSyntax? parameterList)
         {
             if (parameterList != null)
@@ -881,6 +884,7 @@ void AppendParameterList(StringBuilder builder, ParameterListSyntax? parameterLi
                 builder.Append(')');
             }
         }
+#endif
     }
 
     public SyntaxList<SyntaxNode> GetMembersOfTypeDeclaration(SyntaxNode typeDeclaration)

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems

@@ -210,6 +210,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Formatting\FormattingOptions2.IndentStyle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Formatting\LineFormattingOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Formatting\SyntaxFormattingOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Formatting\VisualBasic\VisualBasicSyntaxFormattingOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\RemoveUnnecessaryImports\RemoveUnnecessaryImportsHelpers.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Indentation\AbstractIndentation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Indentation\AbstractIndentation.Indenter.cs" />

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/DiagnosticCategory.cs

@@ -4,7 +4,7 @@
 
 namespace Microsoft.CodeAnalysis.Diagnostics;
 
-internal static class DiagnosticCategory
+internal static partial class DiagnosticCategory
 {
     public const string Style = nameof(Style);
     public const string CodeQuality = nameof(CodeQuality);

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/DiagnosticSeverityExtensions_Shared.cs

@@ -8,26 +8,6 @@ namespace Microsoft.CodeAnalysis.Diagnostics;
 
 internal static partial class DiagnosticSeverityExtensions
 {
-    /// <summary>
-    /// Returns the equivalent <see cref="ReportDiagnostic"/> for a <see cref="DiagnosticSeverity"/> value.
-    /// </summary>
-    /// <param name="diagnosticSeverity">The <see cref="DiagnosticSeverity"/> value.</param>
-    /// <returns>
-    /// The equivalent <see cref="ReportDiagnostic"/> for the <see cref="DiagnosticSeverity"/> value.
-    /// </returns>
-    /// <exception cref="InvalidOperationException">
-    /// If <paramref name="diagnosticSeverity"/> is not one of the expected values.
-    /// </exception>
-    public static ReportDiagnostic ToReportDiagnostic(this DiagnosticSeverity diagnosticSeverity)
-        => diagnosticSeverity switch
-        {
-            DiagnosticSeverity.Hidden => ReportDiagnostic.Hidden,
-            DiagnosticSeverity.Info => ReportDiagnostic.Info,
-            DiagnosticSeverity.Warning => ReportDiagnostic.Warn,
-            DiagnosticSeverity.Error => ReportDiagnostic.Error,
-            _ => throw ExceptionUtilities.UnexpectedValue(diagnosticSeverity),
-        };
-
     public static string ToEditorConfigString(this DiagnosticSeverity diagnosticSeverity)
     {
         return diagnosticSeverity switch

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ReportDiagnosticExtensions.cs

@@ -9,64 +9,6 @@ namespace Microsoft.CodeAnalysis.Diagnostics;
 
 internal static partial class ReportDiagnosticExtensions
 {
-    /// <summary>
-    /// Returns the equivalent <see cref="DiagnosticSeverity"/> for a <see cref="ReportDiagnostic"/> value.
-    /// </summary>
-    /// <param name="reportDiagnostic">The <see cref="ReportDiagnostic"/> value.</param>
-    /// <returns>
-    /// The equivalent <see cref="DiagnosticSeverity"/> for a <see cref="ReportDiagnostic"/> value; otherwise,
-    /// <see langword="null"/> if <see cref="DiagnosticSeverity"/> does not contain a direct equivalent for
-    /// <paramref name="reportDiagnostic"/>.
-    /// </returns>
-    /// <exception cref="InvalidOperationException">
-    /// If <paramref name="reportDiagnostic"/> is not one of the expected values.
-    /// </exception>
-    public static DiagnosticSeverity? ToDiagnosticSeverity(this ReportDiagnostic reportDiagnostic)
-    {
-        switch (reportDiagnostic)
-        {
-            case ReportDiagnostic.Error:
-                return DiagnosticSeverity.Error;
-
-            case ReportDiagnostic.Warn:
-                return DiagnosticSeverity.Warning;
-
-            case ReportDiagnostic.Info:
-                return DiagnosticSeverity.Info;
-
-            case ReportDiagnostic.Hidden:
-                return DiagnosticSeverity.Hidden;
-
-            case ReportDiagnostic.Suppress:
-            case ReportDiagnostic.Default:
-                return null;
-
-            default:
-                throw ExceptionUtilities.UnexpectedValue(reportDiagnostic);
-        }
-    }
-
-    /// <summary>
-    /// Applies a default severity to a <see cref="ReportDiagnostic"/> value.
-    /// </summary>
-    /// <param name="reportDiagnostic">The <see cref="ReportDiagnostic"/> value.</param>
-    /// <param name="defaultSeverity">The default severity.</param>
-    /// <returns>
-    /// <para>If <paramref name="reportDiagnostic"/> is <see cref="ReportDiagnostic.Default"/>, returns
-    /// <paramref name="defaultSeverity"/>.</para>
-    /// <para>-or-</para>
-    /// <para>Otherwise, returns <paramref name="reportDiagnostic"/> if it has a non-default value.</para>
-    /// </returns>
-    public static ReportDiagnostic WithDefaultSeverity(this ReportDiagnostic reportDiagnostic, DiagnosticSeverity defaultSeverity)
-    {
-        if (reportDiagnostic != ReportDiagnostic.Default)
-        {
-            return reportDiagnostic;
-        }
-
-        return defaultSeverity.ToReportDiagnostic();
-    }
-
     public static string ToEditorConfigString(this ReportDiagnostic reportDiagnostic)
     {
         return reportDiagnostic switch

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/SemanticModelExtensions.cs

@@ -12,7 +12,7 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Roslyn.Utilities;
 
-#if !CODE_STYLE
+#if WORKSPACE
 using Humanizer;
 #endif
 
@@ -204,7 +204,7 @@ private static bool TryGeneratePluralizedNameFromTypeArgument(
 
     public static string Pluralize(string word)
     {
-#if CODE_STYLE
+#if !WORKSPACE
         return word;
 #else
         return word.Pluralize();

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs

@@ -8,8 +8,7 @@
 using Microsoft.CodeAnalysis.Indentation;
 using Microsoft.CodeAnalysis.CodeStyle;
 
-#if CODE_STYLE
-using WorkspacesResources = Microsoft.CodeAnalysis.CodeStyleResources;
+#if !WORKSPACE
 using PublicIndentStyle = Microsoft.CodeAnalysis.Formatting.FormattingOptions2.IndentStyle;
 #else
 using PublicIndentStyle = Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle;

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/NamingStyleOptions.cs

@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis.Options;
 using System.Collections.Immutable;
 
-#if !CODE_STYLE
+#if WORKSPACE
 using Microsoft.CodeAnalysis.Host;
 #endif
 
@@ -33,7 +33,7 @@ internal static class NamingStyleOptions
 }
 
 internal interface NamingStylePreferencesProvider
-#if !CODE_STYLE
+#if WORKSPACE
     : OptionsProvider<NamingStylePreferences>
 #endif
 {

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/IOption2.cs

@@ -14,14 +14,14 @@ namespace Microsoft.CodeAnalysis.Options;
 /// set of interface members.
 /// </summary>
 internal interface IOption2 : IEquatable<IOption2?>
-#if !CODE_STYLE
+#if WORKSPACE
     , IOption
 #endif
 {
     OptionDefinition Definition { get; }
     IPublicOption? PublicOption { get; }
 
-#if CODE_STYLE
+#if !WORKSPACE
     bool IsPerLanguage { get; }
 #endif
 }

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/Option2.cs

@@ -75,7 +75,7 @@ private void VerifyNamingConvention()
     public T DefaultValue => Definition.DefaultValue;
     OptionDefinition IOption2.Definition => Definition;
 
-#if CODE_STYLE
+#if !WORKSPACE
     bool IOption2.IsPerLanguage => false;
 #else
     string IOption.Feature => "config";

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/OptionDefinition.cs

@@ -96,7 +96,7 @@ public static bool IsSupportedOptionType(Type type)
            type == typeof(long?) ||
            type.IsEnum ||
            Nullable.GetUnderlyingType(type)?.IsEnum == true ||
-#if !CODE_STYLE
+#if WORKSPACE
            typeof(ICodeStyleOption).IsAssignableFrom(type) ||
 #endif
            typeof(ICodeStyleOption2).IsAssignableFrom(type) ||

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/PerLanguageOption2.cs

@@ -64,7 +64,7 @@ private void VerifyNamingConvention()
     OptionDefinition IOption2.Definition => Definition;
     public T DefaultValue => Definition.DefaultValue;
 
-#if CODE_STYLE
+#if !WORKSPACE
     bool IOption2.IsPerLanguage => true;
 #else
     string IOption.Feature => "config";

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/PublicOptionFactory.cs

@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Options;
 
 internal static class PublicOptionFactory
 {
-#if CODE_STYLE
+#if !WORKSPACE
 #pragma warning disable IDE0060 // Remove unused parameter
 
     // Stubs to avoid #ifdefs at call sites.

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Serialization/ObjectWriter.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable CS0419 // Ambiguous reference in cref attribute
+
 using System;
 using System.Diagnostics;
 using System.IO;

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SemanticFacts/ISemanticFacts.cs

@@ -121,7 +121,7 @@ internal partial interface ISemanticFacts
 
     bool TryGetPrimaryConstructor(INamedTypeSymbol typeSymbol, [NotNullWhen(true)] out IMethodSymbol? primaryConstructor);
 
-#if !CODE_STYLE
+#if WORKSPACE
 
     /// <summary>
     /// Given a location in a document, returns the symbol that intercepts the original symbol called at that location.