Merge pull request #73040 from davidwengier/CleanupRazorEA

Clean up Razor EA

src/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/contentFiles/.editorconfig

@@ -11,4 +11,8 @@ generated_code = true
 
 # The above configurations don't apply to compiler warnings.  Requiring all params to be documented
 # is not something we require for this project, so suppressing it directly here.
-dotnet_diagnostic.CS1573.severity = none
+dotnet_diagnostic.CS1573.severity = none
+
+# As above, we need to specifically disable compiler warnings that we don't want to break downstream
+# builds
+dotnet_diagnostic.IDE0005.severity = none

src/LanguageServer/Protocol/WellKnownLspServerKinds.cs

@@ -57,7 +57,6 @@ public static string ToUserVisibleString(this WellKnownLspServerKinds server)
     {
         return server switch
         {
-            WellKnownLspServerKinds.RazorCohostServer => "Razor Cohost Language Server Client",
             WellKnownLspServerKinds.RazorLspServer => "Razor C# Language Server Client",
             WellKnownLspServerKinds.LiveShareLspServer => "Live Share C#/Visual Basic Language Server Client",
             WellKnownLspServerKinds.AlwaysActiveVSLspServer => "Roslyn Language Server Client",
@@ -75,8 +74,6 @@ public static string ToTelemetryString(this WellKnownLspServerKinds server)
     {
         return server switch
         {
-            WellKnownLspServerKinds.RazorCohostServer => "RazorCohostLanguageClient",
-
             // Telemetry was previously reported as RazorInProcLanguageClient.GetType().Name
             WellKnownLspServerKinds.RazorLspServer => "RazorInProcLanguageClient",
 
@@ -104,7 +101,6 @@ public static string GetContractName(this WellKnownLspServerKinds server)
     {
         return server switch
         {
-            WellKnownLspServerKinds.RazorCohostServer => ProtocolConstants.RazorCohostContract,
             WellKnownLspServerKinds.RazorLspServer => ProtocolConstants.RoslynLspLanguagesContract,
             WellKnownLspServerKinds.LiveShareLspServer => ProtocolConstants.RoslynLspLanguagesContract,
             WellKnownLspServerKinds.AlwaysActiveVSLspServer => ProtocolConstants.RoslynLspLanguagesContract,

src/Tools/ExternalAccess/Razor/Cohost/AbstractRazorLspService.cs

@@ -7,7 +7,7 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 
 /// <summary>
-/// Base class for services that need to live in Razor but be exported using <see cref="ExportRazorStatelessLspServiceAttribute"/>
+/// Base class for services that need to live in Razor but cannot be exported using <see cref="ExportCohostStatelessLspServiceAttribute"/>
 /// since those services must implement <see cref="ILspService"/> but the Razor code doesn't have IVT to it.
 /// </summary>
 internal abstract class AbstractRazorLspService : ILspService

src/Tools/ExternalAccess/Razor/Cohost/Constants.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.LanguageServer;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
@@ -12,12 +11,6 @@ internal static class Constants
 {
     public const string RazorLanguageName = LanguageInfoProvider.RazorLanguageName;
 
-    public const string RazorLSPContentType = "Razor";
-
-    public const string RazorLanguageContract = ProtocolConstants.RazorCohostContract;
-
-    public static readonly ImmutableArray<string> RazorLanguage = ImmutableArray.Create("Razor");
-
     // The UI context is provided by Razor, so this guid must match the one in https://github.com/dotnet/razor/blob/main/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorConstants.cs
     public static readonly Guid RazorCohostingUIContext = new Guid("6d5b86dc-6b8a-483b-ae30-098a3c7d6774");
 }

src/Tools/ExternalAccess/Razor/Cohost/IRazorCustomMessageTarget.cs

@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
+
 namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 
+[Obsolete("This should no longer be used")]
 internal interface IRazorCustomMessageTarget
 {
 }