Merge pull request #39594 from mavasani/FixRPSIssue

Don't MEF import core Roslyn language service type in SolutionExplore…

src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs

@@ -35,7 +35,6 @@ internal class AnalyzersCommandHandler : IAnalyzersCommandHandler, IVsUpdateSolu
         private readonly AnalyzerItemsTracker _tracker;
         private readonly AnalyzerReferenceManager _analyzerReferenceManager;
         private readonly IServiceProvider _serviceProvider;
-        private readonly ICodeActionEditHandlerService _editHandlerService;
 
         private ContextMenuController _analyzerFolderContextMenuController;
         private ContextMenuController _analyzerContextMenuController;
@@ -72,13 +71,11 @@ internal class AnalyzersCommandHandler : IAnalyzersCommandHandler, IVsUpdateSolu
         public AnalyzersCommandHandler(
             AnalyzerItemsTracker tracker,
             AnalyzerReferenceManager analyzerReferenceManager,
-            [Import(typeof(SVsServiceProvider))]IServiceProvider serviceProvider,
-            ICodeActionEditHandlerService editHandlerService)
+            [Import(typeof(SVsServiceProvider))]IServiceProvider serviceProvider)
         {
             _tracker = tracker;
             _analyzerReferenceManager = analyzerReferenceManager;
             _serviceProvider = serviceProvider;
-            _editHandlerService = editHandlerService;
         }
 
         /// <summary>
@@ -432,6 +429,7 @@ private void SetSeverityHandler(object sender, EventArgs args)
 
                 var componentModel = (IComponentModel)_serviceProvider.GetService(typeof(SComponentModel));
                 var waitIndicator = componentModel.GetService<IWaitIndicator>();
+                var editHandlerService = componentModel.GetService<ICodeActionEditHandlerService>();
 
                 try
                 {
@@ -450,7 +448,7 @@ private void SetSeverityHandler(object sender, EventArgs args)
                                 {
                                     var newSolution = selectedDiagnostic.GetSolutionWithUpdatedAnalyzerConfigSeverityAsync(selectedAction.Value, project, waitContext.CancellationToken).WaitAndGetResult(waitContext.CancellationToken);
                                     var operations = ImmutableArray.Create<CodeActionOperation>(new ApplyChangesOperation(newSolution));
-                                    _editHandlerService.Apply(
+                                    editHandlerService.Apply(
                                         _workspace,
                                         fromDocument: null,
                                         operations: operations,

src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerCommandHandlerTests.vb

@@ -19,7 +19,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
                 isEnabledByDefault:=True)
             Dim diagnosticItem = New LegacyDiagnosticItem(Nothing, descriptor, ReportDiagnostic.Error, Nothing)
 
-            Dim handler = New AnalyzersCommandHandler(Nothing, Nothing, Nothing, Nothing)
+            Dim handler = New AnalyzersCommandHandler(Nothing, Nothing, Nothing)
             Dim shown = handler.DiagnosticContextMenuController.ShowContextMenu({diagnosticItem}, Nothing)
             Debug.Assert(Not shown)
         End Sub