Switch to simple primary constructors for several DI types. (#78513)

CyrusNajmabadi · web-flow · commit 93861475471b · 2025-05-09T12:07:34.000-07:00
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptDidChangeHandler.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptDidChangeHandler.cs
@@ -11,11 +11,6 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 
 [ExportStatelessLspService(typeof(DidChangeHandler), ProtocolConstants.TypeScriptLanguageContract), Shared]
-internal class VSTypeScriptDidChangeHandler : DidChangeHandler
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSTypeScriptDidChangeHandler()
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class VSTypeScriptDidChangeHandler() : DidChangeHandler;
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptDidCloseHandler.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptDidCloseHandler.cs
@@ -11,11 +11,6 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 
 [ExportStatelessLspService(typeof(DidCloseHandler), ProtocolConstants.TypeScriptLanguageContract), Shared]
-internal class VSTypeScriptDidCloseHandler : DidCloseHandler
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSTypeScriptDidCloseHandler()
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class VSTypeScriptDidCloseHandler() : DidCloseHandler;
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptDidOpenHandler.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptDidOpenHandler.cs
@@ -11,11 +11,6 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 
 [ExportStatelessLspService(typeof(DidOpenHandler), ProtocolConstants.TypeScriptLanguageContract), Shared]
-internal class VSTypeScriptDidOpenHandler : DidOpenHandler
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSTypeScriptDidOpenHandler()
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class VSTypeScriptDidOpenHandler() : DidOpenHandler;
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptLifeCycleManager.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptLifeCycleManager.cs
@@ -11,11 +11,7 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 
 [ExportLspServiceFactory(typeof(LspServiceLifeCycleManager), ProtocolConstants.TypeScriptLanguageContract), Shared]
-internal class VSTypeScriptLifeCycleManager : LspServiceLifeCycleManager.LspLifeCycleManagerFactory
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSTypeScriptLifeCycleManager(LspWorkspaceRegistrationService lspWorkspaceRegistrationService) : base(lspWorkspaceRegistrationService)
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class VSTypeScriptLifeCycleManager(LspWorkspaceRegistrationService lspWorkspaceRegistrationService)
+    : LspServiceLifeCycleManager.LspLifeCycleManagerFactory(lspWorkspaceRegistrationService);
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptLspWorkspaceManagerFactory.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptLspWorkspaceManagerFactory.cs
@@ -12,6 +12,5 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 [ExportLspServiceFactory(typeof(LspWorkspaceManager), ProtocolConstants.TypeScriptLanguageContract), Shared]
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-internal class VSTypeScriptLspWorkspaceManagerFactory(LspWorkspaceRegistrationService lspWorkspaceRegistrationService) : LspWorkspaceManagerFactory(lspWorkspaceRegistrationService)
-{
-}
+internal class VSTypeScriptLspWorkspaceManagerFactory(LspWorkspaceRegistrationService lspWorkspaceRegistrationService)
+    : LspWorkspaceManagerFactory(lspWorkspaceRegistrationService);
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptProjectContextHandler.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptProjectContextHandler.cs
@@ -11,11 +11,6 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 
 [ExportStatelessLspService(typeof(GetTextDocumentWithContextHandler), ProtocolConstants.TypeScriptLanguageContract), Shared]
-internal class VSTypeScriptProjectContextHandler : GetTextDocumentWithContextHandler
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSTypeScriptProjectContextHandler()
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class VSTypeScriptProjectContextHandler() : GetTextDocumentWithContextHandler;
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptRequestTelemetryLoggerFactory.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptRequestTelemetryLoggerFactory.cs
@@ -11,11 +11,6 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
 
 [ExportLspServiceFactory(typeof(RequestTelemetryLogger), ProtocolConstants.TypeScriptLanguageContract), Shared]
-internal class VSTypeScriptRequestTelemetryLoggerFactory : RequestTelemetryLoggerFactory
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSTypeScriptRequestTelemetryLoggerFactory()
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class VSTypeScriptRequestTelemetryLoggerFactory() : RequestTelemetryLoggerFactory;
diff --git a/src/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActions/UnifiedSuggestedAction.cs b/src/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActions/UnifiedSuggestedAction.cs
@@ -10,18 +10,11 @@ namespace Microsoft.CodeAnalysis.UnifiedSuggestions;
 /// Similar to SuggestedAction, but in a location that can be used by
 /// both local Roslyn and LSP.
 /// </summary>
-internal class UnifiedSuggestedAction : IUnifiedSuggestedAction
+internal class UnifiedSuggestedAction(Workspace workspace, CodeAction codeAction, CodeActionPriority codeActionPriority) : IUnifiedSuggestedAction
 {
-    public Workspace Workspace { get; }
+    public Workspace Workspace { get; } = workspace;
 
-    public CodeAction OriginalCodeAction { get; }
+    public CodeAction OriginalCodeAction { get; } = codeAction;
 
-    public CodeActionPriority CodeActionPriority { get; }
-
-    public UnifiedSuggestedAction(Workspace workspace, CodeAction codeAction, CodeActionPriority codeActionPriority)
-    {
-        Workspace = workspace;
-        OriginalCodeAction = codeAction;
-        CodeActionPriority = codeActionPriority;
-    }
+    public CodeActionPriority CodeActionPriority { get; } = codeActionPriority;
 }
diff --git a/src/LanguageServer/Protocol/Handler/Commands/ProvidesCommandAttribute.cs b/src/LanguageServer/Protocol/Handler/Commands/ProvidesCommandAttribute.cs
@@ -9,9 +9,5 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Commands;
 
 [MetadataAttribute]
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-internal class CommandAttribute : MethodAttribute
-{
-    public CommandAttribute(string command) : base(AbstractExecuteWorkspaceCommandHandler.GetRequestNameForCommandName(command))
-    {
-    }
-}
+internal class CommandAttribute(string command)
+    : MethodAttribute(AbstractExecuteWorkspaceCommandHandler.GetRequestNameForCommandName(command));
diff --git a/src/LanguageServer/Protocol/Handler/DocumentChanges/DidCloseHandler.cs b/src/LanguageServer/Protocol/Handler/DocumentChanges/DidCloseHandler.cs
@@ -15,14 +15,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.DocumentChanges;
 
 [ExportCSharpVisualBasicStatelessLspService(typeof(DidCloseHandler)), Shared]
 [Method(LSP.Methods.TextDocumentDidCloseName)]
-internal class DidCloseHandler : ILspServiceNotificationHandler<LSP.DidCloseTextDocumentParams>, ITextDocumentIdentifierHandler<LSP.DidCloseTextDocumentParams, TextDocumentIdentifier>
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class DidCloseHandler() : ILspServiceNotificationHandler<LSP.DidCloseTextDocumentParams>, ITextDocumentIdentifierHandler<LSP.DidCloseTextDocumentParams, TextDocumentIdentifier>
 {
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public DidCloseHandler()
-    {
-    }
-
     public bool MutatesSolutionState => true;
     public bool RequiresLSPSolution => false;
 
diff --git a/src/LanguageServer/Protocol/Handler/DocumentChanges/DidOpenHandler.cs b/src/LanguageServer/Protocol/Handler/DocumentChanges/DidOpenHandler.cs
@@ -16,14 +16,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.DocumentChanges;
 
 [ExportCSharpVisualBasicStatelessLspService(typeof(DidOpenHandler)), Shared]
 [Method(LSP.Methods.TextDocumentDidOpenName)]
-internal class DidOpenHandler : ILspServiceNotificationHandler<LSP.DidOpenTextDocumentParams>, ITextDocumentIdentifierHandler<LSP.DidOpenTextDocumentParams, TextDocumentItem>
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class DidOpenHandler() : ILspServiceNotificationHandler<LSP.DidOpenTextDocumentParams>, ITextDocumentIdentifierHandler<LSP.DidOpenTextDocumentParams, TextDocumentItem>
 {
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public DidOpenHandler()
-    {
-    }
-
     public bool MutatesSolutionState => true;
     public bool RequiresLSPSolution => false;
 
diff --git a/src/LanguageServer/Protocol/Handler/MethodAttribute.cs b/src/LanguageServer/Protocol/Handler/MethodAttribute.cs
@@ -8,9 +8,5 @@
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler;
 
 [MetadataAttribute]
-internal class MethodAttribute : LanguageServerEndpointAttribute
-{
-    public MethodAttribute(string method) : base(method, LanguageServerConstants.DefaultLanguageName)
-    {
-    }
-}
+internal class MethodAttribute(string method)
+    : LanguageServerEndpointAttribute(method, LanguageServerConstants.DefaultLanguageName);
diff --git a/src/LanguageServer/Protocol/Handler/ProjectContext/GetTextDocumentWithContextHandler.cs b/src/LanguageServer/Protocol/Handler/ProjectContext/GetTextDocumentWithContextHandler.cs
@@ -17,14 +17,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler;
 
 [ExportCSharpVisualBasicStatelessLspService(typeof(GetTextDocumentWithContextHandler)), Shared]
 [Method(VSMethods.GetProjectContextsName)]
-internal class GetTextDocumentWithContextHandler : ILspServiceDocumentRequestHandler<VSGetProjectContextsParams, VSProjectContextList?>
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class GetTextDocumentWithContextHandler() : ILspServiceDocumentRequestHandler<VSGetProjectContextsParams, VSProjectContextList?>
 {
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public GetTextDocumentWithContextHandler()
-    {
-    }
-
     public bool MutatesSolutionState => false;
     public bool RequiresLSPSolution => true;
 
diff --git a/src/LanguageServer/Protocol/Handler/Telemetry/RequestTelemetryLoggerFactory.cs b/src/LanguageServer/Protocol/Handler/Telemetry/RequestTelemetryLoggerFactory.cs
@@ -9,16 +9,10 @@
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler;
 
 [ExportCSharpVisualBasicLspServiceFactory(typeof(RequestTelemetryLogger)), Shared]
-internal class RequestTelemetryLoggerFactory : ILspServiceFactory
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class RequestTelemetryLoggerFactory() : ILspServiceFactory
 {
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public RequestTelemetryLoggerFactory()
-    {
-    }
-
     public ILspService CreateILspService(LspServices lspServices, WellKnownLspServerKinds serverKind)
-    {
-        return new RequestTelemetryLogger(serverKind.ToTelemetryString());
-    }
+        => new RequestTelemetryLogger(serverKind.ToTelemetryString());
 }
diff --git a/src/LanguageServer/Protocol/LspServices/AbstractLspServiceProvider.cs b/src/LanguageServer/Protocol/LspServices/AbstractLspServiceProvider.cs
@@ -9,18 +9,12 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer;
 
-internal class AbstractLspServiceProvider
+internal abstract class AbstractLspServiceProvider(
+    IEnumerable<Lazy<ILspService, LspServiceMetadataView>> specificLspServices,
+    IEnumerable<Lazy<ILspServiceFactory, LspServiceMetadataView>> specificLspServiceFactories)
 {
-    private readonly ImmutableArray<Lazy<ILspService, LspServiceMetadataView>> _lspServices;
-    private readonly ImmutableArray<Lazy<ILspServiceFactory, LspServiceMetadataView>> _lspServiceFactories;
-
-    public AbstractLspServiceProvider(
-        IEnumerable<Lazy<ILspService, LspServiceMetadataView>> specificLspServices,
-        IEnumerable<Lazy<ILspServiceFactory, LspServiceMetadataView>> specificLspServiceFactories)
-    {
-        _lspServices = [.. specificLspServices];
-        _lspServiceFactories = [.. specificLspServiceFactories];
-    }
+    private readonly ImmutableArray<Lazy<ILspService, LspServiceMetadataView>> _lspServices = [.. specificLspServices];
+    private readonly ImmutableArray<Lazy<ILspServiceFactory, LspServiceMetadataView>> _lspServiceFactories = [.. specificLspServiceFactories];
 
     public LspServices CreateServices(WellKnownLspServerKinds serverKind, FrozenDictionary<string, ImmutableArray<BaseService>> baseServices)
     {
diff --git a/src/LanguageServer/Protocol/LspServices/ExportCSharpVisualBasicLspServiceFactoryAttribute.cs b/src/LanguageServer/Protocol/LspServices/ExportCSharpVisualBasicLspServiceFactoryAttribute.cs
@@ -11,9 +11,5 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler;
 /// Defines an easy to use subclass for <see cref="ExportLspServiceFactoryAttribute"/> with the roslyn languages contract name.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false), MetadataAttribute]
-internal class ExportCSharpVisualBasicLspServiceFactoryAttribute : ExportLspServiceFactoryAttribute
-{
-    public ExportCSharpVisualBasicLspServiceFactoryAttribute(Type type, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any) : base(type, ProtocolConstants.RoslynLspLanguagesContract, serverKind)
-    {
-    }
-}
+internal class ExportCSharpVisualBasicLspServiceFactoryAttribute(Type type, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any)
+    : ExportLspServiceFactoryAttribute(type, ProtocolConstants.RoslynLspLanguagesContract, serverKind);
diff --git a/src/LanguageServer/Protocol/LspServices/ExportCSharpVisualBasicStatelessLspServiceAttribute.cs b/src/LanguageServer/Protocol/LspServices/ExportCSharpVisualBasicStatelessLspServiceAttribute.cs
@@ -8,9 +8,5 @@
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler;
 
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false), MetadataAttribute]
-internal class ExportCSharpVisualBasicStatelessLspServiceAttribute : ExportStatelessLspServiceAttribute
-{
-    public ExportCSharpVisualBasicStatelessLspServiceAttribute(Type type, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any) : base(type, ProtocolConstants.RoslynLspLanguagesContract, serverKind)
-    {
-    }
-}
+internal class ExportCSharpVisualBasicStatelessLspServiceAttribute(Type type, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any)
+    : ExportStatelessLspServiceAttribute(type, ProtocolConstants.RoslynLspLanguagesContract, serverKind);
diff --git a/src/LanguageServer/Protocol/LspServices/ExportLspServiceFactoryAttribute.cs b/src/LanguageServer/Protocol/LspServices/ExportLspServiceFactoryAttribute.cs
@@ -15,11 +15,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer;
 /// when the LSP server instance shuts down.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false), MetadataAttribute]
-internal class ExportLspServiceFactoryAttribute : AbstractExportLspServiceAttribute
-{
-    public ExportLspServiceFactoryAttribute(
-        Type serviceType, string contractName, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any)
-        : base(serviceType, contractName, contractType: typeof(ILspServiceFactory), isStateless: false, serverKind)
-    {
-    }
-}
+internal class ExportLspServiceFactoryAttribute(
+    Type serviceType, string contractName, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any)
+    : AbstractExportLspServiceAttribute(
+        serviceType, contractName, contractType: typeof(ILspServiceFactory), isStateless: false, serverKind);
diff --git a/src/LanguageServer/Protocol/LspServices/ExportStatelessLspServiceAttribute.cs b/src/LanguageServer/Protocol/LspServices/ExportStatelessLspServiceAttribute.cs
@@ -15,11 +15,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer;
 /// MEF will dispose of these services when the container is disposed of.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = false), MetadataAttribute]
-internal class ExportStatelessLspServiceAttribute : AbstractExportLspServiceAttribute
-{
-    public ExportStatelessLspServiceAttribute(
-        Type serviceType, string contractName, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any)
-        : base(serviceType, contractName, contractType: typeof(ILspService), isStateless: true, serverKind)
-    {
-    }
-}
+internal class ExportStatelessLspServiceAttribute(
+    Type serviceType, string contractName, WellKnownLspServerKinds serverKind = WellKnownLspServerKinds.Any)
+    : AbstractExportLspServiceAttribute(
+        serviceType, contractName, contractType: typeof(ILspService), isStateless: true, serverKind);
diff --git a/src/LanguageServer/Protocol/LspServices/RoslynLspServiceProvider.cs b/src/LanguageServer/Protocol/LspServices/RoslynLspServiceProvider.cs
@@ -10,14 +10,9 @@
 namespace Microsoft.CodeAnalysis.LanguageServer;
 
 [Export(typeof(CSharpVisualBasicLspServiceProvider)), Shared]
-internal sealed class CSharpVisualBasicLspServiceProvider : AbstractLspServiceProvider
-{
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public CSharpVisualBasicLspServiceProvider(
-        [ImportMany(ProtocolConstants.RoslynLspLanguagesContract)] IEnumerable<Lazy<ILspService, LspServiceMetadataView>> lspServices,
-        [ImportMany(ProtocolConstants.RoslynLspLanguagesContract)] IEnumerable<Lazy<ILspServiceFactory, LspServiceMetadataView>> lspServiceFactories)
-    : base(lspServices, lspServiceFactories)
-    {
-    }
-}
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal sealed class CSharpVisualBasicLspServiceProvider(
+    [ImportMany(ProtocolConstants.RoslynLspLanguagesContract)] IEnumerable<Lazy<ILspService, LspServiceMetadataView>> lspServices,
+    [ImportMany(ProtocolConstants.RoslynLspLanguagesContract)] IEnumerable<Lazy<ILspServiceFactory, LspServiceMetadataView>> lspServiceFactories)
+    : AbstractLspServiceProvider(lspServices, lspServiceFactories);
diff --git a/src/LanguageServer/Protocol/Workspaces/LspWorkspaceManagerFactory.cs b/src/LanguageServer/Protocol/Workspaces/LspWorkspaceManagerFactory.cs
@@ -11,23 +11,16 @@
 namespace Microsoft.CodeAnalysis.LanguageServer;
 
 [ExportCSharpVisualBasicLspServiceFactory(typeof(LspWorkspaceManager)), Shared]
-internal class LspWorkspaceManagerFactory : ILspServiceFactory
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal class LspWorkspaceManagerFactory(LspWorkspaceRegistrationService lspWorkspaceRegistrationService) : ILspServiceFactory
 {
-    private readonly LspWorkspaceRegistrationService _workspaceRegistrationService;
-
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public LspWorkspaceManagerFactory(LspWorkspaceRegistrationService lspWorkspaceRegistrationService)
-    {
-        _workspaceRegistrationService = lspWorkspaceRegistrationService;
-    }
-
     public ILspService CreateILspService(LspServices lspServices, WellKnownLspServerKinds serverKind)
     {
         var logger = lspServices.GetRequiredService<AbstractLspLogger>();
         var miscFilesWorkspace = lspServices.GetService<ILspMiscellaneousFilesWorkspaceProvider>();
         var languageInfoProvider = lspServices.GetRequiredService<ILanguageInfoProvider>();
         var telemetryLogger = lspServices.GetRequiredService<RequestTelemetryLogger>();
-        return new LspWorkspaceManager(logger, miscFilesWorkspace, _workspaceRegistrationService, languageInfoProvider, telemetryLogger);
+        return new LspWorkspaceManager(logger, miscFilesWorkspace, lspWorkspaceRegistrationService, languageInfoProvider, telemetryLogger);
     }
 }
diff --git a/src/Tools/ExternalAccess/Xaml/External/XamlCommandAttribute.cs b/src/Tools/ExternalAccess/Xaml/External/XamlCommandAttribute.cs
@@ -10,9 +10,4 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.Xaml;
 
 [MetadataAttribute]
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-internal sealed class XamlCommandAttribute : CommandAttribute
-{
-    public XamlCommandAttribute(string command) : base(command)
-    {
-    }
-}
+internal sealed class XamlCommandAttribute(string command) : CommandAttribute(command);
diff --git a/src/VisualStudio/Xaml/Impl/Implementation/LanguageServer/Handler/CodeActions/CodeActionsHandlerProvider.cs b/src/VisualStudio/Xaml/Impl/Implementation/LanguageServer/Handler/CodeActions/CodeActionsHandlerProvider.cs
