From 6fc7412eaa45ddc7f5032f380bd94d24cbd3077b Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Mon, 23 Feb 2015 12:04:38 -0800
Subject: [PATCH 1/8] Rename "Open Rule Set" to "Open Active Rule Set"

This makes it a little more clear which .ruleset file is going to be
opened, and brings the text in line with other menu items such as "Set
as Active Rule Set".
---
 src/VisualStudio/Setup/Commands.vsct | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/VisualStudio/Setup/Commands.vsct b/src/VisualStudio/Setup/Commands.vsct
index 5a7187560c121..1e457cb9207d1 100644
--- a/src/VisualStudio/Setup/Commands.vsct
+++ b/src/VisualStudio/Setup/Commands.vsct
@@ -193,10 +193,10 @@
       <Button guid="guidRoslynGrpId" id="cmdidOpenRuleSet" priority="200" type="Button">
         <Parent guid="guidRoslynGrpId" id="grpAnalyzerFolderContextMenu" />
         <Strings>
-          <ButtonText>&amp;Open Rule Set</ButtonText>
-          <CanonicalName>OpenRuleSet</CanonicalName>
-          <LocCanonicalName>OpenRuleSet</LocCanonicalName>
-          <CommandName>OpenRuleSet</CommandName>
+          <ButtonText>&amp;Open Active Rule Set</ButtonText>
+          <CanonicalName>OpenActiveRuleSet</CanonicalName>
+          <LocCanonicalName>OpenActiveRuleSet</LocCanonicalName>
+          <CommandName>OpenActiveRuleSet</CommandName>
         </Strings>
       </Button>
       <!-- Buttons to set severity of diagnostics -->

From a00ad6c492ad542cb14528f81501d2f3a2951a49 Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Mon, 23 Feb 2015 14:06:31 -0800
Subject: [PATCH 2/8] Move severity menu items to a sub menu

This commit moves the menu items to change a diagnostic's severity
(Error, Warning, Info, etc.) off of the context menu and into a sub menu
under "Set Rule Set Severity". This reduces clutter and makes it clearer
what is going to be changed by selecting one of these.
---
 src/VisualStudio/Setup/Commands.vsct | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/VisualStudio/Setup/Commands.vsct b/src/VisualStudio/Setup/Commands.vsct
index 1e457cb9207d1..7211a8290af6a 100644
--- a/src/VisualStudio/Setup/Commands.vsct
+++ b/src/VisualStudio/Setup/Commands.vsct
@@ -50,6 +50,10 @@
         <Parent guid="guidRoslynGrpId" id="cmdidDiagnosticContextMenu"/>
       </Group>
 
+      <Group guid="guidRoslynGrpId" id="grpDiagnosticSeverityItems" priority="0x000">
+        <Parent guid="guidRoslynGrpId" id="cmdidSetSeveritySubMenu"/>
+      </Group>
+
       <Group guid="guidRoslynGrpId" id="grpDiagnosticProperties" priority="0x002">
         <Parent guid="guidRoslynGrpId" id="cmdidDiagnosticContextMenu"/>
       </Group>
@@ -201,7 +205,7 @@
       </Button>
       <!-- Buttons to set severity of diagnostics -->
       <Button guid="guidRoslynGrpId" id="cmdidSetSeverityError" priority="100" type="Button">
-        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverity" />
+        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverityItems" />
         <Strings>
           <ButtonText>&amp;Error</ButtonText>
           <CanonicalName>Error</CanonicalName>
@@ -210,7 +214,7 @@
         </Strings>
       </Button>
       <Button guid="guidRoslynGrpId" id="cmdidSetSeverityWarning" priority="200" type="Button">
-        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverity" />
+        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverityItems" />
         <Strings>
           <ButtonText>&amp;Warning</ButtonText>
           <CanonicalName>Warning</CanonicalName>
@@ -219,7 +223,7 @@
         </Strings>
       </Button>
       <Button guid="guidRoslynGrpId" id="cmdidSetSeverityInfo" priority="300" type="Button">
-        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverity" />
+        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverityItems" />
         <Strings>
           <ButtonText>&amp;Info</ButtonText>
           <CanonicalName>Info</CanonicalName>
@@ -228,7 +232,7 @@
         </Strings>
       </Button>
       <Button guid="guidRoslynGrpId" id="cmdidSetSeverityHidden" priority="400" type="Button">
-        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverity" />
+        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverityItems" />
         <Strings>
           <ButtonText>&amp;Hidden</ButtonText>
           <CanonicalName>Hidden</CanonicalName>
@@ -237,7 +241,7 @@
         </Strings>
       </Button>
       <Button guid="guidRoslynGrpId" id="cmdidSetSeverityNone" priority="500" type="Button">
-        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverity" />
+        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverityItems" />
         <Strings>
           <ButtonText>&amp;None</ButtonText>
           <CanonicalName>None</CanonicalName>
@@ -316,6 +320,16 @@
           <LocCanonicalName>Diagnostic</LocCanonicalName>
         </Strings>
       </Menu>
+
+      <Menu guid="guidRoslynGrpId" id="cmdidSetSeveritySubMenu" priority="50" type="Menu">
+        <Parent guid="guidRoslynGrpId" id="grpDiagnosticSeverity" />
+        <Strings>
+          <ButtonText>Set Rule Set Severity</ButtonText>
+          <CommandName>Set Rule Set Severity</CommandName>
+          <CanonicalName>Set Rule Set Severity</CanonicalName>
+          <LocCanonicalName>Set Rule Set Severity</LocCanonicalName>
+        </Strings>
+      </Menu>
     </Menus>
   </Commands>
 
@@ -398,6 +412,8 @@
       <IDSymbol name="cmdidOpenDiagnosticHelpLink"    value="0x0116" />
       <IDSymbol name="grpSetActiveRuleSet"            value="0x0117" />
       <IDSymbol name="cmdidSetActiveRuleSet"          value="0x0118" />
+      <IDSymbol name="cmdidSetSeveritySubMenu"        value="0x0119" />
+      <IDSymbol name="grpDiagnosticSeverityItems"     value="0x011a" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>

From a32a1102c934c7aa925ba3de7af07ac02e25f535 Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Mon, 23 Feb 2015 14:27:24 -0800
Subject: [PATCH 3/8] Fix bug in "Open Help Link" visibility

We only want to show the "Open Help Link" menu item when a single
diagnostic is selected in Solution Explorer. However, we weren't
updating the visibility correctly when the set of selected diagnostics
changed.
---
 .../SolutionExplorerShim/AnalyzersCommandHandler.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
index d9ff1660b4f7e..4f61ad4c380b9 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
@@ -121,6 +121,7 @@ private void SelectedDiagnosticItemsChangedHandler(object sender, EventArgs e)
 
             UpdateSeverityMenuItemsChecked();
             UpdateSeverityMenuItemsEnabled();
+            UpdateOpenHelpLinkMenuItemVisibility();
         }
 
         private void DiagnosticItemPropertyChangedHandler(object sender, PropertyChangedEventArgs e)
@@ -144,16 +145,18 @@ private void UpdateMenuItemVisibility()
             _projectContextAddMenuItem.Visible = selectedProjectSupportsAnalyzers && _tracker.SelectedItemId == VSConstants.VSITEMID_ROOT;
             _referencesContextAddMenuItem.Visible = selectedProjectSupportsAnalyzers;
 
-            _openHelpLinkMenuItem.Visible = _tracker.SelectedDiagnosticItems.Length == 1 &&
-                                            !string.IsNullOrWhiteSpace(_tracker.SelectedDiagnosticItems[0].Descriptor.HelpLinkUri);
-
-
             string itemName;
             _setActiveRuleSetMenuItem.Visible = selectedProjectSupportsAnalyzers &&
                                                 _tracker.SelectedHierarchy.TryGetItemName(_tracker.SelectedItemId, out itemName) &&
                                                 Path.GetExtension(itemName).Equals(".ruleset", StringComparison.OrdinalIgnoreCase);
         }
 
+        private void UpdateOpenHelpLinkMenuItemVisibility()
+        {
+            _openHelpLinkMenuItem.Visible = _tracker.SelectedDiagnosticItems.Length == 1 &&
+                                                        !string.IsNullOrWhiteSpace(_tracker.SelectedDiagnosticItems[0].Descriptor.HelpLinkUri);
+        }
+
         private void UpdateSeverityMenuItemsChecked()
         {
             _setSeverityErrorMenuItem.Checked = AnyDiagnosticsWithSeverity(ReportDiagnostic.Error);

From 4b198bf0d1771d2d5a587ae9f32fdee83540ddb2 Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Tue, 24 Feb 2015 15:26:17 -0800
Subject: [PATCH 4/8] Update context menu item state lazily

Right now we update a bunch of state within our Solution Explorer
context menus on every change to the set of selected items in the
Solution Explorer. This state includes things like which items are
visible, which are enabled, and which are checked. In most cases it
would be better to simply wait until a context menu is about to be
displayed, and then go update the item state.

The big change here is that ContextMenuController now updates the menu
item state before showing the menu; this requires that the
AnalyzersCommandHandler create the ContextMenuController instances since
it owns the menu items.

Most of this change is simply about piping the ContextMenuControllers
from the AnalyzersCommandHandler down to the individual
AnalyzersFolderItems/AnalyzerItems/DiagnosticsItems. I also had to add
an IAnalyzerCommandHandler interface so that I could create a no-op
implementation for the unit tests.
---
 .../AnalyzerItem/AnalyzerItem.cs              |  11 +-
 .../AnalyzerItem/AnalyzerItemProvider.cs      |   5 +-
 .../AnalyzerItem/AnalyzerItemSource.cs        |   9 +-
 .../AnalyzersCommandHandler.cs                | 198 ++++++++++++------
 .../AnalyzersFolderItem.cs                    |  11 +-
 .../AnalyzersFolderItemProvider.cs            |  12 +-
 .../AnalyzersFolderItemSource.cs              |   7 +-
 .../ContextMenuController.cs                  |   6 +-
 .../DiagnosticItem/DiagnosticItem.cs          |  11 +-
 .../DiagnosticItem/DiagnosticItemProvider.cs  |   5 +-
 .../DiagnosticItem/DiagnosticItemSource.cs    |   9 +-
 .../IAnalyzersCommandHandler.cs               |  11 +
 .../SolutionExplorerShim.csproj               |   5 +-
 .../Core/Test/ServicesVisualStudioTest.vbproj |   1 +
 .../SolutionExplorer/AnalyzerItemTests.vb     |   8 +-
 .../AnalyzerItemsSourceTests.vb               |   4 +-
 .../AnalyzersFolderItemTests.vb               |   4 +-
 .../AnalyzersFolderProviderTests.vb           |   6 +-
 .../SolutionExplorer/DiagnosticItemTests.vb   |   4 +-
 .../FakeAnalyzersCommandHandler.vb            |  24 +++
 20 files changed, 233 insertions(+), 118 deletions(-)
 create mode 100644 src/VisualStudio/Core/SolutionExplorerShim/IAnalyzersCommandHandler.cs
 create mode 100644 src/VisualStudio/Core/Test/SolutionExplorer/FakeAnalyzersCommandHandler.vb

diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItem.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItem.cs
index c42328a4661fa..b6815a83dcfd6 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItem.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItem.cs
@@ -14,17 +14,14 @@ internal partial class AnalyzerItem : BaseItem
     {
         private readonly AnalyzersFolderItem _analyzersFolder;
         private readonly AnalyzerReference _analyzerReference;
+        private readonly IContextMenuController _contextMenuController;
 
-        private static readonly ContextMenuController s_itemContextMenuController =
-            new ContextMenuController(
-                ID.RoslynCommands.AnalyzerContextMenu,
-                items => items.All(item => item is AnalyzerItem));
-
-        public AnalyzerItem(AnalyzersFolderItem analyzersFolder, AnalyzerReference analyzerReference)
+        public AnalyzerItem(AnalyzersFolderItem analyzersFolder, AnalyzerReference analyzerReference, IContextMenuController contextMenuController)
             : base(GetNameText(analyzerReference))
         {
             _analyzersFolder = analyzersFolder;
             _analyzerReference = analyzerReference;
+            _contextMenuController = contextMenuController;
         }
 
         public override ImageMoniker IconMoniker
@@ -70,7 +67,7 @@ public AnalyzerReference AnalyzerReference
 
         public override IContextMenuController ContextMenuController
         {
-            get { return s_itemContextMenuController; }
+            get { return _contextMenuController; }
         }
 
         public AnalyzersFolderItem AnalyzersFolder
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemProvider.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemProvider.cs
index bf5dbff913af6..444ef4980ad42 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemProvider.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemProvider.cs
@@ -12,11 +12,14 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplore
     [Order]
     internal class AnalyzerItemProvider : AttachedCollectionSourceProvider<AnalyzersFolderItem>
     {
+        [Import(typeof(AnalyzersCommandHandler))]
+        private IAnalyzersCommandHandler _commandHandler = null;
+
         protected override IAttachedCollectionSource CreateCollectionSource(AnalyzersFolderItem analyzersFolder, string relationshipName)
         {
             if (relationshipName == KnownRelationships.Contains)
             {
-                return new AnalyzerItemSource(analyzersFolder);
+                return new AnalyzerItemSource(analyzersFolder, _commandHandler);
             }
 
             return null;
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemSource.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemSource.cs
index 46bbe56db3b96..3a67c9a2cc95e 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemSource.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItem/AnalyzerItemSource.cs
@@ -15,14 +15,17 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplore
     internal class AnalyzerItemSource : IAttachedCollectionSource, INotifyPropertyChanged
     {
         private readonly AnalyzersFolderItem _analyzersFolder;
+        private readonly IAnalyzersCommandHandler _commandHandler;
         private IReadOnlyCollection<AnalyzerReference> _analyzerReferences;
         private BulkObservableCollection<AnalyzerItem> _analyzerItems;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public AnalyzerItemSource(AnalyzersFolderItem analyzersFolder)
+        public AnalyzerItemSource(AnalyzersFolderItem analyzersFolder, IAnalyzersCommandHandler commandHandler)
         {
             _analyzersFolder = analyzersFolder;
+            _commandHandler = commandHandler;
+
             _analyzersFolder.Workspace.WorkspaceChanged += Workspace_WorkspaceChanged;
         }
 
@@ -98,7 +101,7 @@ private void UpdateAnalyzers()
 
                 foreach (var reference in referencesToAdd)
                 {
-                    _analyzerItems.Add(new AnalyzerItem(_analyzersFolder, reference));
+                    _analyzerItems.Add(new AnalyzerItem(_analyzersFolder, reference, _commandHandler.AnalyzerContextMenuController));
                 }
 
                 var sorted = _analyzerItems.OrderBy(item => item.AnalyzerReference.Display).ToArray();
@@ -161,7 +164,7 @@ public IEnumerable Items
                         _analyzerReferences = project.AnalyzerReferences;
                         var initialSet = _analyzerReferences
                                             .OrderBy(ar => ar.Display)
-                                            .Select(ar => new AnalyzerItem(_analyzersFolder, ar));
+                                            .Select(ar => new AnalyzerItem(_analyzersFolder, ar, _commandHandler.AnalyzerContextMenuController));
                         _analyzerItems.AddRange(initialSet);
                     }
                 }
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
index 4f61ad4c380b9..58a5e375a74c8 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Notification;
+using Microsoft.Internal.VisualStudio.PlatformUI;
 using Microsoft.VisualStudio.CodeAnalysis;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
@@ -25,36 +26,51 @@
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplorer
 {
     [Export]
-    internal class AnalyzersCommandHandler : IVsUpdateSolutionEvents
+    internal class AnalyzersCommandHandler : IAnalyzersCommandHandler, IVsUpdateSolutionEvents
     {
-        [Import]
-        private AnalyzerItemsTracker _tracker = null;
+        private readonly AnalyzerItemsTracker _tracker;
+        private readonly AnalyzerReferenceManager _analyzerReferenceManager;
+        private readonly IServiceProvider _serviceProvider;
 
-        [Import]
-        private AnalyzerReferenceManager _analyzerReferenceManager = null;
-
-        [Import(typeof(SVsServiceProvider))]
-        private IServiceProvider _serviceProvider = null;
+        private ContextMenuController _analyzerFolderContextMenuController;
+        private ContextMenuController _analyzerContextMenuController;
+        private ContextMenuController _diagnosticContextMenuController;
 
+        // Analyzers folder context menu items
         private MenuCommand _addMenuItem;
-        private MenuCommand _projectAddMenuItem;
-        private MenuCommand _projectContextAddMenuItem;
-        private MenuCommand _referencesContextAddMenuItem;
-        private MenuCommand _removeMenuItem;
         private MenuCommand _openRuleSetMenuItem;
-        private MenuCommand _setActiveRuleSetMenuItem;
 
+        // Analyzer context menu items
+        private MenuCommand _removeMenuItem;
+
+        // Diagnostic context menu items
         private MenuCommand _setSeverityErrorMenuItem;
         private MenuCommand _setSeverityWarningMenuItem;
         private MenuCommand _setSeverityInfoMenuItem;
         private MenuCommand _setSeverityHiddenMenuItem;
         private MenuCommand _setSeverityNoneMenuItem;
-
         private MenuCommand _openHelpLinkMenuItem;
 
+        // Other menu items
+        private MenuCommand _projectAddMenuItem;
+        private MenuCommand _projectContextAddMenuItem;
+        private MenuCommand _referencesContextAddMenuItem;
+        private MenuCommand _setActiveRuleSetMenuItem;
+
         private Workspace _workspace;
 
-        private ImmutableArray<DiagnosticItem> _selectedDiagnosticItems = ImmutableArray<DiagnosticItem>.Empty;
+        private bool _allowProjectSystemOperations = true;
+
+        [ImportingConstructor]
+        public AnalyzersCommandHandler(
+            AnalyzerItemsTracker tracker,
+            AnalyzerReferenceManager analyzerReferenceManager,
+            [Import(typeof(SVsServiceProvider))]IServiceProvider serviceProvider)
+        {
+            _tracker = tracker;
+            _analyzerReferenceManager = analyzerReferenceManager;
+            _serviceProvider = serviceProvider;
+        }
 
         /// <summary>
         /// Hook up the context menu handlers.
@@ -63,31 +79,32 @@ public void Initialize(IMenuCommandService menuCommandService)
         {
             if (menuCommandService != null)
             {
+                // Analyzers folder context menu items
                 _addMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.AddAnalyzer, AddAnalyzerHandler);
-                _projectAddMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.ProjectAddAnalyzer, AddAnalyzerHandler);
-                _projectContextAddMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.ProjectContextAddAnalyzer, AddAnalyzerHandler);
-                _referencesContextAddMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.ReferencesContextAddAnalyzer, AddAnalyzerHandler);
+                _openRuleSetMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.OpenRuleSet, OpenRuleSetHandler);
 
+                // Analyzer context menu items
                 _removeMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.RemoveAnalyzer, RemoveAnalyzerHandler);
 
-                _openRuleSetMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.OpenRuleSet, OpenRuleSetHandler);
-                _setActiveRuleSetMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetActiveRuleSet, SetActiveRuleSetHandler);
-
+                // Diagnostic context menu items
                 _setSeverityErrorMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetSeverityError, SetSeverityHandler);
                 _setSeverityWarningMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetSeverityWarning, SetSeverityHandler);
                 _setSeverityInfoMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetSeverityInfo, SetSeverityHandler);
                 _setSeverityHiddenMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetSeverityHidden, SetSeverityHandler);
                 _setSeverityNoneMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetSeverityNone, SetSeverityHandler);
-
                 _openHelpLinkMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.OpenDiagnosticHelpLink, OpenDiagnosticHelpLinkHandler);
 
-                UpdateMenuItemVisibility();
-                UpdateSeverityMenuItemsChecked();
+                // Other menu items
+                _projectAddMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.ProjectAddAnalyzer, AddAnalyzerHandler);
+                _projectContextAddMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.ProjectContextAddAnalyzer, AddAnalyzerHandler);
+                _referencesContextAddMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.ReferencesContextAddAnalyzer, AddAnalyzerHandler);
+                _setActiveRuleSetMenuItem = AddCommandHandler(menuCommandService, ID.RoslynCommands.SetActiveRuleSet, SetActiveRuleSetHandler);
+
+                UpdateOtherMenuItemsVisibility();
 
                 if (_tracker != null)
                 {
                     _tracker.SelectedHierarchyItemChanged += SelectedHierarchyItemChangedHandler;
-                    _tracker.SelectedDiagnosticItemsChanged += SelectedDiagnosticItemsChangedHandler;
                 }
 
                 var buildManager = (IVsSolutionBuildManager)_serviceProvider.GetService(typeof(SVsSolutionBuildManager));
@@ -96,51 +113,105 @@ public void Initialize(IMenuCommandService menuCommandService)
             }
         }
 
-        private MenuCommand AddCommandHandler(IMenuCommandService menuCommandService, int roslynCommand, EventHandler handler)
+        public IContextMenuController AnalyzerFolderContextMenuController
         {
-            var commandID = new CommandID(Guids.RoslynGroupId, roslynCommand);
-            var menuCommand = new MenuCommand(handler, commandID);
-            menuCommandService.AddCommand(menuCommand);
+            get
+            {
+                if (_analyzerFolderContextMenuController == null)
+                {
+                    _analyzerFolderContextMenuController = new ContextMenuController(
+                        ID.RoslynCommands.AnalyzerFolderContextMenu,
+                        ShouldShowAnalyzerFolderContextMenu,
+                        UpdateAnalyzerFolderContextMenu);
+                }
 
-            return menuCommand;
+                return _analyzerFolderContextMenuController;
+            }
         }
 
-        private void SelectedDiagnosticItemsChangedHandler(object sender, EventArgs e)
+        private bool ShouldShowAnalyzerFolderContextMenu(IEnumerable<object> items)
         {
-            foreach (var item in _selectedDiagnosticItems)
+            return items.Count() == 1;
+        }
+
+        private void UpdateAnalyzerFolderContextMenu()
+        {
+            _addMenuItem.Visible = SelectedProjectSupportsAnalyzers();
+            _addMenuItem.Enabled = _allowProjectSystemOperations;
+        }
+
+        public IContextMenuController AnalyzerContextMenuController
+        {
+            get
             {
-                item.PropertyChanged -= DiagnosticItemPropertyChangedHandler;
+                if (_analyzerContextMenuController == null)
+                {
+                    _analyzerContextMenuController = new ContextMenuController(
+                        ID.RoslynCommands.AnalyzerContextMenu,
+                        ShouldShowAnalyzerContextMenu,
+                        UpdateAnalyzerContextMenu);
+                }
+
+                return _analyzerContextMenuController;
             }
 
-            _selectedDiagnosticItems = _tracker.SelectedDiagnosticItems;
+        }
+
+        private bool ShouldShowAnalyzerContextMenu(IEnumerable<object> items)
+        {
+            return items.All(item => item is AnalyzerItem);
+        }
+
+        private void UpdateAnalyzerContextMenu()
+        {
+            _removeMenuItem.Enabled = _allowProjectSystemOperations;
+        }
 
-            foreach (var item in _selectedDiagnosticItems)
+        public IContextMenuController DiagnosticContextMenuController
+        {
+            get
             {
-                item.PropertyChanged += DiagnosticItemPropertyChangedHandler;
+                if (_diagnosticContextMenuController == null)
+                {
+                    _diagnosticContextMenuController = new ContextMenuController(
+                        ID.RoslynCommands.DiagnosticContextMenu,
+                        ShouldShowDiagnosticContextMenu,
+                        UpdateDiagnosticContextMenu);
+                }
+
+                return _diagnosticContextMenuController;
             }
+        }
+
+        private bool ShouldShowDiagnosticContextMenu(IEnumerable<object> items)
+        {
+            return items.All(item => item is DiagnosticItem);
+        }
 
+        private void UpdateDiagnosticContextMenu()
+        {
             UpdateSeverityMenuItemsChecked();
             UpdateSeverityMenuItemsEnabled();
             UpdateOpenHelpLinkMenuItemVisibility();
         }
 
-        private void DiagnosticItemPropertyChangedHandler(object sender, PropertyChangedEventArgs e)
+        private MenuCommand AddCommandHandler(IMenuCommandService menuCommandService, int roslynCommand, EventHandler handler)
         {
-            if (e.PropertyName == nameof(DiagnosticItem.EffectiveSeverity))
-            {
-                UpdateSeverityMenuItemsChecked();
-            }
+            var commandID = new CommandID(Guids.RoslynGroupId, roslynCommand);
+            var menuCommand = new MenuCommand(handler, commandID);
+            menuCommandService.AddCommand(menuCommand);
+
+            return menuCommand;
         }
 
         private void SelectedHierarchyItemChangedHandler(object sender, EventArgs e)
         {
-            UpdateMenuItemVisibility();
+            UpdateOtherMenuItemsVisibility();
         }
 
-        private void UpdateMenuItemVisibility()
+        private void UpdateOtherMenuItemsVisibility()
         {
             bool selectedProjectSupportsAnalyzers = SelectedProjectSupportsAnalyzers();
-            _addMenuItem.Visible = selectedProjectSupportsAnalyzers;
             _projectAddMenuItem.Visible = selectedProjectSupportsAnalyzers;
             _projectContextAddMenuItem.Visible = selectedProjectSupportsAnalyzers && _tracker.SelectedItemId == VSConstants.VSITEMID_ROOT;
             _referencesContextAddMenuItem.Visible = selectedProjectSupportsAnalyzers;
@@ -151,6 +222,14 @@ private void UpdateMenuItemVisibility()
                                                 Path.GetExtension(itemName).Equals(".ruleset", StringComparison.OrdinalIgnoreCase);
         }
 
+        private void UpdateOtherMenuItemsEnabled()
+        {
+            _projectAddMenuItem.Enabled = _allowProjectSystemOperations;
+            _projectContextAddMenuItem.Enabled = _allowProjectSystemOperations;
+            _referencesContextAddMenuItem.Enabled = _allowProjectSystemOperations;
+            _removeMenuItem.Enabled = _allowProjectSystemOperations;
+        }
+
         private void UpdateOpenHelpLinkMenuItemVisibility()
         {
             _openHelpLinkMenuItem.Visible = _tracker.SelectedDiagnosticItems.Length == 1 &&
@@ -168,12 +247,12 @@ private void UpdateSeverityMenuItemsChecked()
 
         private bool AnyDiagnosticsWithSeverity(ReportDiagnostic severity)
         {
-            return _selectedDiagnosticItems.Any(item => item.EffectiveSeverity == severity);
+            return _tracker.SelectedDiagnosticItems.Any(item => item.EffectiveSeverity == severity);
         }
 
         private void UpdateSeverityMenuItemsEnabled()
         {
-            bool configurable = !_selectedDiagnosticItems.Any(item => item.Descriptor.CustomTags.Contains(WellKnownDiagnosticTags.NotConfigurable));
+            bool configurable = !_tracker.SelectedDiagnosticItems.Any(item => item.Descriptor.CustomTags.Contains(WellKnownDiagnosticTags.NotConfigurable));
 
             _setSeverityErrorMenuItem.Enabled = configurable;
             _setSeverityWarningMenuItem.Enabled = configurable;
@@ -482,14 +561,16 @@ private void SendErrorNotification(Workspace workspace, string title, string mes
 
         int IVsUpdateSolutionEvents.UpdateSolution_Begin(ref int pfCancelUpdate)
         {
-            DisableMenuItems();
+            _allowProjectSystemOperations = false;
+            UpdateOtherMenuItemsEnabled();
 
             return VSConstants.S_OK;
         }
 
         int IVsUpdateSolutionEvents.UpdateSolution_Done(int fSucceeded, int fModified, int fCancelCommand)
         {
-            EnableMenuItems();
+            _allowProjectSystemOperations = true;
+            UpdateOtherMenuItemsEnabled();
 
             return VSConstants.S_OK;
         }
@@ -501,7 +582,8 @@ int IVsUpdateSolutionEvents.UpdateSolution_StartUpdate(ref int pfCancelUpdate)
 
         int IVsUpdateSolutionEvents.UpdateSolution_Cancel()
         {
-            EnableMenuItems();
+            _allowProjectSystemOperations = true;
+            UpdateOtherMenuItemsEnabled();
 
             return VSConstants.S_OK;
         }
@@ -511,24 +593,6 @@ int IVsUpdateSolutionEvents.OnActiveProjectCfgChange(IVsHierarchy pIVsHierarchy)
             return VSConstants.S_OK;
         }
 
-        private void DisableMenuItems()
-        {
-            _addMenuItem.Enabled = false;
-            _projectAddMenuItem.Enabled = false;
-            _projectContextAddMenuItem.Enabled = false;
-            _referencesContextAddMenuItem.Enabled = false;
-            _removeMenuItem.Enabled = false;
-        }
-
-        private void EnableMenuItems()
-        {
-            _addMenuItem.Enabled = true;
-            _projectAddMenuItem.Enabled = true;
-            _projectContextAddMenuItem.Enabled = true;
-            _referencesContextAddMenuItem.Enabled = true;
-            _removeMenuItem.Enabled = true;
-        }
-
         private Workspace TryGetWorkspace()
         {
             if (_workspace == null)
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItem.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItem.cs
index f4f151b7a3c5b..fbd5576c24d70 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItem.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItem.cs
@@ -17,21 +17,20 @@ internal partial class AnalyzersFolderItem : BaseItem
         private readonly Workspace _workspace;
         private readonly ProjectId _projectId;
         private readonly IVsHierarchyItem _parentItem;
+        private readonly IContextMenuController _contextMenuController;
 
-        private static readonly ContextMenuController s_folderContextMenuController =
-            new ContextMenuController(
-                ID.RoslynCommands.AnalyzerFolderContextMenu,
-                items => items.Count() == 1);
 
         public AnalyzersFolderItem(
             Workspace workspace,
             ProjectId projectId,
-            IVsHierarchyItem parentItem)
+            IVsHierarchyItem parentItem,
+            IContextMenuController contextMenuController)
             : base(SolutionExplorerShim.AnalyzersFolderItem_Name)
         {
             _workspace = workspace;
             _projectId = projectId;
             _parentItem = parentItem;
+            _contextMenuController = contextMenuController;
         }
 
         public override ImageMoniker IconMoniker
@@ -72,7 +71,7 @@ public override object GetBrowseObject()
 
         public override IContextMenuController ContextMenuController
         {
-            get { return s_folderContextMenuController; }
+            get { return _contextMenuController; }
         }
 
         /// <summary>
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemProvider.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemProvider.cs
index 53450f1e88198..a3b4d34562450 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemProvider.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemProvider.cs
@@ -27,25 +27,27 @@ internal class AnalyzersFolderItemProvider : AttachedCollectionSourceProvider<IV
         private static readonly Guid s_visualBasicProjectId = new Guid(VisualBasicProjectIdString);
 
         private readonly IComponentModel _componentModel;
+        private readonly IAnalyzersCommandHandler _commandHandler;
         private IHierarchyItemToProjectIdMap _projectMap;
         private Workspace _workspace;
 
         [ImportingConstructor]
         public AnalyzersFolderItemProvider(
-            [Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
+            [Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider,
+            [Import(typeof(AnalyzersCommandHandler))] IAnalyzersCommandHandler commandHandler)
         {
             _componentModel = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
+            _commandHandler = commandHandler;
         }
 
         /// <summary>
         /// Constructor for use only in unit tests. Bypasses MEF to set the project mapper, workspace and glyph service.
         /// </summary>
-        /// <param name="workspace"></param>
-        /// <param name="projectMap"></param>
-        internal AnalyzersFolderItemProvider(IHierarchyItemToProjectIdMap projectMap, Workspace workspace)
+        internal AnalyzersFolderItemProvider(IHierarchyItemToProjectIdMap projectMap, Workspace workspace, IAnalyzersCommandHandler commandHandler)
         {
             _projectMap = projectMap;
             _workspace = workspace;
+            _commandHandler = commandHandler;
         }
 
         protected override IAttachedCollectionSource CreateCollectionSource(IVsHierarchyItem item, string relationshipName)
@@ -78,7 +80,7 @@ private IAttachedCollectionSource CreateCollectionSourceCore(IVsHierarchyItem pa
                 hierarchyMapper.TryGetProjectId(parentItem, out projectId))
             {
                 var workspace = TryGetWorkspace();
-                return new AnalyzersFolderItemSource(workspace, projectId, item);
+                return new AnalyzersFolderItemSource(workspace, projectId, item, _commandHandler);
             }
 
             return null;
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemSource.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemSource.cs
index 97a8dbb9c410e..3dc273cf5d1d2 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemSource.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersFolderItem/AnalyzersFolderItemSource.cs
@@ -14,12 +14,14 @@ internal class AnalyzersFolderItemSource : IAttachedCollectionSource
         private readonly Workspace _workspace;
         private readonly ProjectId _projectId;
         private readonly ObservableCollection<AnalyzersFolderItem> _folderItems;
+        private readonly IAnalyzersCommandHandler _commandHandler;
 
-        public AnalyzersFolderItemSource(Workspace workspace, ProjectId projectId, IVsHierarchyItem projectHierarchyItem)
+        public AnalyzersFolderItemSource(Workspace workspace, ProjectId projectId, IVsHierarchyItem projectHierarchyItem, IAnalyzersCommandHandler commandHandler)
         {
             _workspace = workspace;
             _projectId = projectId;
             _projectHierarchyItem = projectHierarchyItem;
+            _commandHandler = commandHandler;
 
             _folderItems = new ObservableCollection<AnalyzersFolderItem>();
 
@@ -62,7 +64,8 @@ internal void Update()
                 new AnalyzersFolderItem(
                     _workspace,
                     _projectId,
-                    _projectHierarchyItem));
+                    _projectHierarchyItem,
+                    _commandHandler.AnalyzerFolderContextMenuController));
         }
     }
 }
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/ContextMenuController.cs b/src/VisualStudio/Core/SolutionExplorerShim/ContextMenuController.cs
index cc9e9ac652de5..7e1063fcae384 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/ContextMenuController.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/ContextMenuController.cs
@@ -17,11 +17,13 @@ internal class ContextMenuController : IContextMenuController
     {
         private readonly int _menuId;
         private readonly Func<IEnumerable<object>, bool> _shouldShowMenu;
+        private readonly Action _updateMenu;
 
-        public ContextMenuController(int menuId, Func<IEnumerable<object>, bool> shouldShowMenu)
+        public ContextMenuController(int menuId, Func<IEnumerable<object>, bool> shouldShowMenu, Action updateMenu)
         {
             _menuId = menuId;
             _shouldShowMenu = shouldShowMenu;
+            _updateMenu = updateMenu;
         }
 
         public bool ShowContextMenu(IEnumerable<object> items, Point location)
@@ -31,6 +33,8 @@ public bool ShowContextMenu(IEnumerable<object> items, Point location)
                 return false;
             }
 
+            _updateMenu();
+
             IVsUIShell shell = Package.GetGlobalService(typeof(SVsUIShell)) as IVsUIShell;
             Guid guidContextMenu = Guids.RoslynGroupId;
             POINTS[] locationPoints = new[] { new POINTS() { x = (short)location.X, y = (short)location.Y } };
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.cs b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.cs
index 218287218da8a..1b6ae54578f3a 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.cs
@@ -23,20 +23,17 @@ internal sealed partial class DiagnosticItem : BaseItem
         private readonly DiagnosticDescriptor _descriptor;
         private ReportDiagnostic _effectiveSeverity;
         private readonly AnalyzerItem _analyzerItem;
-
-        private static readonly ContextMenuController s_diagnosticContextMenuController =
-            new ContextMenuController(
-                ID.RoslynCommands.DiagnosticContextMenu,
-                items => items.All(item => item is DiagnosticItem));
+        private readonly IContextMenuController _contextMenuController;
 
         public override event PropertyChangedEventHandler PropertyChanged;
 
-        public DiagnosticItem(AnalyzerItem analyzerItem, DiagnosticDescriptor descriptor, ReportDiagnostic effectiveSeverity)
+        public DiagnosticItem(AnalyzerItem analyzerItem, DiagnosticDescriptor descriptor, ReportDiagnostic effectiveSeverity, IContextMenuController contextMenuController)
             : base(string.Format("{0}: {1}", descriptor.Id, descriptor.Title))
         {
             _analyzerItem = analyzerItem;
             _descriptor = descriptor;
             _effectiveSeverity = effectiveSeverity;
+            _contextMenuController = contextMenuController;
         }
 
         public override ImageMoniker IconMoniker
@@ -80,7 +77,7 @@ public override IContextMenuController ContextMenuController
         {
             get
             {
-                return s_diagnosticContextMenuController;
+                return _contextMenuController;
             }
         }
 
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemProvider.cs b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemProvider.cs
index 6021715159db5..db20ca3594687 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemProvider.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemProvider.cs
@@ -12,11 +12,14 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplore
     [Order]
     internal sealed class DiagnosticItemProvider : AttachedCollectionSourceProvider<AnalyzerItem>
     {
+        [Import(typeof(AnalyzersCommandHandler))]
+        private IAnalyzersCommandHandler _commandHandler = null;
+
         protected override IAttachedCollectionSource CreateCollectionSource(AnalyzerItem item, string relationshipName)
         {
             if (relationshipName == KnownRelationships.Contains)
             {
-                return new DiagnosticItemSource(item);
+                return new DiagnosticItemSource(item, _commandHandler);
             }
 
             return null;
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemSource.cs b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemSource.cs
index 0c69cd3b2ba5f..78d16c6dda2b1 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemSource.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemSource.cs
@@ -17,16 +17,18 @@ internal partial class DiagnosticItemSource : IAttachedCollectionSource
     {
         private static readonly DiagnosticDescriptorComparer s_comparer = new DiagnosticDescriptorComparer();
 
-        private AnalyzerItem _item;
+        private readonly AnalyzerItem _item;
+        private readonly IAnalyzersCommandHandler _commandHandler;
         private BulkObservableCollection<DiagnosticItem> _diagnosticItems;
         private Workspace _workspace;
         private ProjectId _projectId;
         private ReportDiagnostic _generalDiagnosticOption;
         private ImmutableDictionary<string, ReportDiagnostic> _specificDiagnosticOptions;
 
-        public DiagnosticItemSource(AnalyzerItem item)
+        public DiagnosticItemSource(AnalyzerItem item, IAnalyzersCommandHandler commandHandler)
         {
             _item = item;
+            _commandHandler = commandHandler;
         }
 
         public object SourceItem
@@ -94,7 +96,8 @@ private IEnumerable<DiagnosticItem> GetDiagnosticItems(string language)
                 .Select(g =>
                 {
                     var selectedDiagnostic = g.OrderBy(d => d, s_comparer).First();
-                    return new DiagnosticItem(_item, selectedDiagnostic, GetEffectiveSeverity(selectedDiagnostic.Id, _specificDiagnosticOptions, _generalDiagnosticOption, selectedDiagnostic.DefaultSeverity, selectedDiagnostic.IsEnabledByDefault));
+                    var effectiveSeverity = GetEffectiveSeverity(selectedDiagnostic.Id, _specificDiagnosticOptions, _generalDiagnosticOption, selectedDiagnostic.DefaultSeverity, selectedDiagnostic.IsEnabledByDefault);
+                    return new DiagnosticItem(_item, selectedDiagnostic, effectiveSeverity, _commandHandler.DiagnosticContextMenuController);
                 });
         }
 
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/IAnalyzersCommandHandler.cs b/src/VisualStudio/Core/SolutionExplorerShim/IAnalyzersCommandHandler.cs
new file mode 100644
index 0000000000000..aeb8c05b01f14
--- /dev/null
+++ b/src/VisualStudio/Core/SolutionExplorerShim/IAnalyzersCommandHandler.cs
@@ -0,0 +1,11 @@
+using Microsoft.Internal.VisualStudio.PlatformUI;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplorer
+{
+    internal interface IAnalyzersCommandHandler
+    {
+        IContextMenuController AnalyzerFolderContextMenuController { get; }
+        IContextMenuController AnalyzerContextMenuController { get; }
+        IContextMenuController DiagnosticContextMenuController { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj b/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj
index fe842d53e7859..454e13478bbdb 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj
+++ b/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj
@@ -27,7 +27,7 @@
     <Reference Include="..\..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll" />
     <Reference Include="Microsoft.VisualStudio.CodeAnalysis.Sdk.UI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.CodeAnalysis.Sdk.UI.dll</HintPath>
-    </Reference> 
+    </Reference>
   </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
@@ -131,6 +131,7 @@
     <Compile Include="DiagnosticItem\DiagnosticItemSource.DiagnosticDescriptorComparer.cs" />
     <Compile Include="DiagnosticItem\RuleSelectionImage.cs" />
     <Compile Include="HierarchyItemToProjectIdMap.cs" />
+    <Compile Include="IAnalyzersCommandHandler.cs" />
     <Compile Include="IHierarchyItemToProjectIdMap.cs" />
     <Compile Include="ISolutionExplorerWorkspaceProvider.cs" />
     <Compile Include="LocalizableProperties.cs" />
@@ -166,4 +167,4 @@
     <Import Project="..\..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj
index be0e37296f918..5deeb43ed1457 100644
--- a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj
+++ b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj
@@ -336,6 +336,7 @@
     <Compile Include="ProjectSystemShim\Framework\MockHierarchy.vb" />
     <Compile Include="ProjectSystemShim\VisualBasicProjectTests.vb" />
     <Compile Include="Snippets\SnippetServiceWaiter.vb" />
+    <Compile Include="SolutionExplorer\FakeAnalyzersCommandHandler.vb" />
     <Compile Include="StubVsEditorAdaptersFactoryService.vb" />
     <Compile Include="Preview\PreviewChangesTests.vb" />
     <Compile Include="Progression\CallsGraphQueryTests.vb" />
diff --git a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemTests.vb b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemTests.vb
index ff7c5fa7874b4..3c9300cd7ea93 100644
--- a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemTests.vb
+++ b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemTests.vb
@@ -18,8 +18,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
             Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceXml)
                 Dim project = workspace.Projects.Single()
 
-                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing)
-                Dim analyzer = New AnalyzerItem(analyzerFolder, project.AnalyzerReferences.Single())
+                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing, Nothing)
+                Dim analyzer = New AnalyzerItem(analyzerFolder, project.AnalyzerReferences.Single(), Nothing)
 
                 Assert.Equal(expected:="Foo", actual:=analyzer.Text)
             End Using
@@ -37,8 +37,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
             Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceXml)
                 Dim project = workspace.Projects.Single()
 
-                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing)
-                Dim analyzer = New AnalyzerItem(analyzerFolder, project.AnalyzerReferences.Single())
+                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing, Nothing)
+                Dim analyzer = New AnalyzerItem(analyzerFolder, project.AnalyzerReferences.Single(), Nothing)
                 Dim browseObject = DirectCast(analyzer.GetBrowseObject(), AnalyzerItem.BrowseObject)
 
                 Assert.Equal(expected:="Analyzer Properties", actual:=browseObject.GetClassName())
diff --git a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemsSourceTests.vb b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemsSourceTests.vb
index d04bd3237c439..1d224c1fb37e0 100644
--- a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemsSourceTests.vb
+++ b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerItemsSourceTests.vb
@@ -20,8 +20,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
             Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceXml)
                 Dim project = workspace.Projects.Single()
 
-                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing)
-                Dim analyzerItemsSource = New AnalyzerItemSource(analyzerFolder)
+                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing, Nothing)
+                Dim analyzerItemsSource = New AnalyzerItemSource(analyzerFolder, New FakeAnalyzersCommandHandler)
 
                 Dim analyzers = analyzerItemsSource.Items.Cast(Of AnalyzerItem)().ToArray()
 
diff --git a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderItemTests.vb b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderItemTests.vb
index facd736284dc8..ef4fda254b08f 100644
--- a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderItemTests.vb
+++ b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderItemTests.vb
@@ -18,7 +18,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
             Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceXml)
                 Dim project = workspace.Projects.Single()
 
-                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing)
+                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing, Nothing)
 
                 Assert.Equal(expected:="Analyzers", actual:=analyzerFolder.Text)
             End Using
@@ -36,7 +36,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
             Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceXml)
                 Dim project = workspace.Projects.Single()
 
-                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing)
+                Dim analyzerFolder = New AnalyzersFolderItem(workspace, project.Id, Nothing, Nothing)
                 Dim browseObject = DirectCast(analyzerFolder.GetBrowseObject(), AnalyzersFolderItem.BrowseObject)
 
                 Assert.Equal(expected:="Analyzers", actual:=browseObject.GetComponentName())
diff --git a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderProviderTests.vb b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderProviderTests.vb
index b4f8f72e6025e..df46653d87026 100644
--- a/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderProviderTests.vb
+++ b/src/VisualStudio/Core/Test/SolutionExplorer/AnalyzersFolderProviderTests.vb
@@ -17,7 +17,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
         Public Sub CreateCollectionSource_NullItem()
             Using environment = New TestEnvironment()
                 Dim provider As IAttachedCollectionSourceProvider =
-                New AnalyzersFolderItemProvider(environment.ServiceProvider)
+                New AnalyzersFolderItemProvider(environment.ServiceProvider, Nothing)
 
                 Dim collectionSource = provider.CreateCollectionSource(Nothing, KnownRelationships.Contains)
 
@@ -29,7 +29,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
         Public Sub CreateCollectionSource_NullHierarchyIdentity()
             Using environment = New TestEnvironment()
                 Dim provider As IAttachedCollectionSourceProvider =
-                New AnalyzersFolderItemProvider(environment.ServiceProvider)
+                New AnalyzersFolderItemProvider(environment.ServiceProvider, Nothing)
 
                 Dim hierarchyItem = New MockHierarchyItem With {.HierarchyIdentity = Nothing}
 
@@ -62,7 +62,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
 
                 Dim mapper = New HierarchyItemMapper(environment.ProjectTracker)
 
-                Dim provider As IAttachedCollectionSourceProvider = New AnalyzersFolderItemProvider(mapper, environment.Workspace)
+                Dim provider As IAttachedCollectionSourceProvider = New AnalyzersFolderItemProvider(mapper, environment.Workspace, New FakeAnalyzersCommandHandler)
 
                 Dim collectionSource = provider.CreateCollectionSource(hierarchyItem, KnownRelationships.Contains)
 
diff --git a/src/VisualStudio/Core/Test/SolutionExplorer/DiagnosticItemTests.vb b/src/VisualStudio/Core/Test/SolutionExplorer/DiagnosticItemTests.vb
index b33bdf74bf6bd..781ffd5357aaa 100644
--- a/src/VisualStudio/Core/Test/SolutionExplorer/DiagnosticItemTests.vb
+++ b/src/VisualStudio/Core/Test/SolutionExplorer/DiagnosticItemTests.vb
@@ -11,7 +11,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
         Public Sub Name()
             Dim descriptor = CreateDescriptor()
 
-            Dim diagnostic = New DiagnosticItem(Nothing, descriptor, ReportDiagnostic.Error)
+            Dim diagnostic = New DiagnosticItem(Nothing, descriptor, ReportDiagnostic.Error, Nothing)
 
             Assert.Equal(expected:="TST0001: A test diagnostic", actual:=diagnostic.Text)
         End Sub
@@ -20,7 +20,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
         Public Sub BrowseObject()
             Dim descriptor = CreateDescriptor()
 
-            Dim diagnostic = New DiagnosticItem(Nothing, descriptor, ReportDiagnostic.Info)
+            Dim diagnostic = New DiagnosticItem(Nothing, descriptor, ReportDiagnostic.Info, Nothing)
             Dim browseObject = DirectCast(diagnostic.GetBrowseObject(), DiagnosticItem.BrowseObject)
 
             Assert.Equal(expected:="Diagnostic Properties", actual:=browseObject.GetClassName())
diff --git a/src/VisualStudio/Core/Test/SolutionExplorer/FakeAnalyzersCommandHandler.vb b/src/VisualStudio/Core/Test/SolutionExplorer/FakeAnalyzersCommandHandler.vb
new file mode 100644
index 0000000000000..f0101a2365c31
--- /dev/null
+++ b/src/VisualStudio/Core/Test/SolutionExplorer/FakeAnalyzersCommandHandler.vb
@@ -0,0 +1,24 @@
+Imports Microsoft.Internal.VisualStudio.PlatformUI
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplorer
+
+Public Class FakeAnalyzersCommandHandler
+    Implements IAnalyzersCommandHandler
+
+    Public ReadOnly Property AnalyzerContextMenuController As IContextMenuController Implements IAnalyzersCommandHandler.AnalyzerContextMenuController
+        Get
+            Return Nothing
+        End Get
+    End Property
+
+    Public ReadOnly Property AnalyzerFolderContextMenuController As IContextMenuController Implements IAnalyzersCommandHandler.AnalyzerFolderContextMenuController
+        Get
+            Return Nothing
+        End Get
+    End Property
+
+    Public ReadOnly Property DiagnosticContextMenuController As IContextMenuController Implements IAnalyzersCommandHandler.DiagnosticContextMenuController
+        Get
+            Return Nothing
+        End Get
+    End Property
+End Class

From 10dcd04a0a0e63b4e3d8ae6cf72ee0c36adb8bee Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Tue, 24 Feb 2015 15:35:48 -0800
Subject: [PATCH 5/8] Remove an event that is no longer used

---
 .../Core/SolutionExplorerShim/AnalyzerItemTracker.cs       | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs
index 520cdbd9e49c2..55c4f32ba4159 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs
@@ -20,7 +20,6 @@ internal class AnalyzerItemsTracker : IVsSelectionEvents
         private IVsMonitorSelection _vsMonitorSelection = null;
         private uint _selectionEventsCookie = 0;
 
-        public event EventHandler SelectedDiagnosticItemsChanged;
         public event EventHandler SelectedHierarchyItemChanged;
 
         [ImportingConstructor]
@@ -87,7 +86,6 @@ int IVsSelectionEvents.OnSelectionChanged(
                                   .Select(b => b.Folder)
                                   .FirstOrDefault();
 
-            var oldSelectedDiagnosticItems = this.SelectedDiagnosticItems;
             this.SelectedDiagnosticItems = selectedObjects
                                            .OfType<DiagnosticItem.BrowseObject>()
                                            .Select(b => b.DiagnosticItem)
@@ -99,11 +97,6 @@ int IVsSelectionEvents.OnSelectionChanged(
                 this.SelectedHierarchyItemChanged?.Invoke(this, EventArgs.Empty);
             }
 
-            if (oldSelectedDiagnosticItems != this.SelectedDiagnosticItems)
-            {
-                this.SelectedDiagnosticItemsChanged?.Invoke(this, EventArgs.Empty);
-            }
-
             return VSConstants.S_OK;
         }
 

From 5f20ac1ece1059689a0a7466f78bab28469963ff Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Wed, 25 Feb 2015 09:30:19 -0800
Subject: [PATCH 6/8] Hide a property from the Properties window

`DiagnosticItem.BrowseObject` has a property, `DiagnosticItem`, that is
used internally and is not meant to show up as an item in the Properties
window. This change suppresses it.
---
 .../DiagnosticItem/DiagnosticItem.BrowseObject.cs                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.BrowseObject.cs b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.BrowseObject.cs
index ecec70e2ef817..59317b6b94fa6 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.BrowseObject.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.BrowseObject.cs
@@ -120,6 +120,7 @@ public override string GetComponentName()
                 return _diagnosticItem.Descriptor.Id;
             }
 
+            [Browsable(false)]
             public DiagnosticItem DiagnosticItem
             {
                 get { return _diagnosticItem; }

From 38a869efa2adff0806d863cb4d967252e0b25d66 Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Wed, 25 Feb 2015 09:37:21 -0800
Subject: [PATCH 7/8] Show rule set severity in the context menu

When you right-click on a diagnostic in the Solution Explorer and open
the "Set Rule Set Severity" sub menu, the check marks actually show you
the effective severity of the rule. This takes into account not just
what is in the rule set file, but also the default severity and any
relevant project options.

This is misleading for a couple of reasons. For one thing, we may show a
checkmark on a severity even though the rule doesn't appear in the rule
set file at all. Worse, choosing a different severity may update the
rule set but leave the checkmark where it is (because some other setting
overrides the rule set) and quite likely confusing the user.

This change updates the checkmarks to truly show what is in the rule set
file, and only what is in the rule set file.
---
 .../AnalyzerItemTracker.cs                    |  1 +
 .../AnalyzersCommandHandler.cs                | 64 +++++++++++++++++--
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs
index 55c4f32ba4159..3fc77871f7925 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzerItemTracker.cs
@@ -58,6 +58,7 @@ int IVsSelectionEvents.OnElementValueChanged(uint elementid, object varValueOld,
         {
             return VSConstants.S_OK;
         }
+
         int IVsSelectionEvents.OnSelectionChanged(
             IVsHierarchy pHierOld,
             uint itemidOld,
diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
index 58a5e375a74c8..99e0946b3930f 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
@@ -238,11 +238,64 @@ private void UpdateOpenHelpLinkMenuItemVisibility()
 
         private void UpdateSeverityMenuItemsChecked()
         {
-            _setSeverityErrorMenuItem.Checked = AnyDiagnosticsWithSeverity(ReportDiagnostic.Error);
-            _setSeverityWarningMenuItem.Checked = AnyDiagnosticsWithSeverity(ReportDiagnostic.Warn);
-            _setSeverityInfoMenuItem.Checked = AnyDiagnosticsWithSeverity(ReportDiagnostic.Info);
-            _setSeverityHiddenMenuItem.Checked = AnyDiagnosticsWithSeverity(ReportDiagnostic.Hidden);
-            _setSeverityNoneMenuItem.Checked = AnyDiagnosticsWithSeverity(ReportDiagnostic.Suppress);
+            bool errorMenuItemChecked = false;
+            bool warningMenuItemChecked = false;
+            bool infoMenuItemChecked = false;
+            bool hiddenMenuItemChecked = false;
+            bool noneMenuItemChecked = false;
+
+            var workspace = TryGetWorkspace() as VisualStudioWorkspaceImpl;
+            if (workspace != null)
+            {
+                var groups = _tracker.SelectedDiagnosticItems.GroupBy(item => item.AnalyzerItem.AnalyzersFolder.ProjectId);
+
+                foreach (var group in groups)
+                {
+                    var project = (AbstractProject)workspace.GetHostProject(group.Key);
+                    IRuleSetFile ruleSet = project.RuleSetFile;
+
+                    if (ruleSet != null)
+                    {
+                        var specificOptions = ruleSet.GetSpecificDiagnosticOptions();
+
+                        foreach (var diagnosticItem in group)
+                        {
+                            ReportDiagnostic ruleSetSeverity;
+                            if (specificOptions.TryGetValue(diagnosticItem.Descriptor.Id, out ruleSetSeverity))
+                            {
+                                switch (ruleSetSeverity)
+                                {
+                                    case ReportDiagnostic.Default:
+                                        break;
+                                    case ReportDiagnostic.Error:
+                                        errorMenuItemChecked = true;
+                                        break;
+                                    case ReportDiagnostic.Warn:
+                                        warningMenuItemChecked = true;
+                                        break;
+                                    case ReportDiagnostic.Info:
+                                        infoMenuItemChecked = true;
+                                        break;
+                                    case ReportDiagnostic.Hidden:
+                                        hiddenMenuItemChecked = true;
+                                        break;
+                                    case ReportDiagnostic.Suppress:
+                                        noneMenuItemChecked = true;
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            _setSeverityErrorMenuItem.Checked = errorMenuItemChecked;
+            _setSeverityWarningMenuItem.Checked = warningMenuItemChecked;
+            _setSeverityInfoMenuItem.Checked = infoMenuItemChecked;
+            _setSeverityHiddenMenuItem.Checked = hiddenMenuItemChecked;
+            _setSeverityNoneMenuItem.Checked = noneMenuItemChecked;
         }
 
         private bool AnyDiagnosticsWithSeverity(ReportDiagnostic severity)
@@ -304,7 +357,6 @@ internal void OpenRuleSetHandler(object sender, EventArgs args)
                 if (workspace != null)
                 {
                     var project = (AbstractProject)workspace.GetHostProject(projectId);
-
                     if (project == null)
                     {
                         SendUnableToOpenRuleSetNotification(workspace, string.Format(SolutionExplorerShim.AnalyzersCommandHandler_CouldNotFindProject, projectId));

From e9eb57176af7c3fa233e62922b0c03945999fe43 Mon Sep 17 00:00:00 2001
From: Tom Meschter <tom.meschter@microsoft.com>
Date: Thu, 5 Mar 2015 07:59:25 -0800
Subject: [PATCH 8/8] Only show check mark if the severities are the same

If the user selects a bunch of diagnostics with differing severities in
Solution Explorer, right-clicks,  and opens the "Set Rule Set Severity"
submenu they will see a check mark next to every applicable severity.
E.g., if one rule is an error and one is a warning, then both Error and
Warn will be checked.

The general feeling is that this will be confusing to users. Instead,
only show a check mark when all the selected rules share the same
severity.
---
 .../AnalyzersCommandHandler.cs                | 96 ++++++++++---------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
index 99e0946b3930f..663cbd8532cde 100644
--- a/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs
@@ -238,64 +238,70 @@ private void UpdateOpenHelpLinkMenuItemVisibility()
 
         private void UpdateSeverityMenuItemsChecked()
         {
-            bool errorMenuItemChecked = false;
-            bool warningMenuItemChecked = false;
-            bool infoMenuItemChecked = false;
-            bool hiddenMenuItemChecked = false;
-            bool noneMenuItemChecked = false;
+            _setSeverityErrorMenuItem.Checked = false;
+            _setSeverityWarningMenuItem.Checked = false;
+            _setSeverityInfoMenuItem.Checked = false;
+            _setSeverityHiddenMenuItem.Checked = false;
+            _setSeverityNoneMenuItem.Checked = false;
 
             var workspace = TryGetWorkspace() as VisualStudioWorkspaceImpl;
-            if (workspace != null)
+            if (workspace == null)
+            {
+                return;
+            }
+
+            HashSet<ReportDiagnostic> selectedItemSeverities = new HashSet<ReportDiagnostic>();
+
+            var groups = _tracker.SelectedDiagnosticItems.GroupBy(item => item.AnalyzerItem.AnalyzersFolder.ProjectId);
+
+            foreach (var group in groups)
             {
-                var groups = _tracker.SelectedDiagnosticItems.GroupBy(item => item.AnalyzerItem.AnalyzersFolder.ProjectId);
+                var project = (AbstractProject)workspace.GetHostProject(group.Key);
+                IRuleSetFile ruleSet = project.RuleSetFile;
 
-                foreach (var group in groups)
+                if (ruleSet != null)
                 {
-                    var project = (AbstractProject)workspace.GetHostProject(group.Key);
-                    IRuleSetFile ruleSet = project.RuleSetFile;
+                    var specificOptions = ruleSet.GetSpecificDiagnosticOptions();
 
-                    if (ruleSet != null)
+                    foreach (var diagnosticItem in group)
                     {
-                        var specificOptions = ruleSet.GetSpecificDiagnosticOptions();
-
-                        foreach (var diagnosticItem in group)
+                        ReportDiagnostic ruleSetSeverity;
+                        if (specificOptions.TryGetValue(diagnosticItem.Descriptor.Id, out ruleSetSeverity) &&
+                            ruleSetSeverity != ReportDiagnostic.Default)
                         {
-                            ReportDiagnostic ruleSetSeverity;
-                            if (specificOptions.TryGetValue(diagnosticItem.Descriptor.Id, out ruleSetSeverity))
-                            {
-                                switch (ruleSetSeverity)
-                                {
-                                    case ReportDiagnostic.Default:
-                                        break;
-                                    case ReportDiagnostic.Error:
-                                        errorMenuItemChecked = true;
-                                        break;
-                                    case ReportDiagnostic.Warn:
-                                        warningMenuItemChecked = true;
-                                        break;
-                                    case ReportDiagnostic.Info:
-                                        infoMenuItemChecked = true;
-                                        break;
-                                    case ReportDiagnostic.Hidden:
-                                        hiddenMenuItemChecked = true;
-                                        break;
-                                    case ReportDiagnostic.Suppress:
-                                        noneMenuItemChecked = true;
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
+                            selectedItemSeverities.Add(ruleSetSeverity);
                         }
                     }
                 }
             }
+            
+            if (selectedItemSeverities.Count != 1)
+            {
+                return;
+            }
 
-            _setSeverityErrorMenuItem.Checked = errorMenuItemChecked;
-            _setSeverityWarningMenuItem.Checked = warningMenuItemChecked;
-            _setSeverityInfoMenuItem.Checked = infoMenuItemChecked;
-            _setSeverityHiddenMenuItem.Checked = hiddenMenuItemChecked;
-            _setSeverityNoneMenuItem.Checked = noneMenuItemChecked;
+            switch (selectedItemSeverities.Single())
+            {
+                case ReportDiagnostic.Default:
+                    break;
+                case ReportDiagnostic.Error:
+                    _setSeverityErrorMenuItem.Checked = true;
+                    break;
+                case ReportDiagnostic.Warn:
+                    _setSeverityWarningMenuItem.Checked = true;
+                    break;
+                case ReportDiagnostic.Info:
+                    _setSeverityInfoMenuItem.Checked = true;
+                    break;
+                case ReportDiagnostic.Hidden:
+                    _setSeverityHiddenMenuItem.Checked = true;
+                    break;
+                case ReportDiagnostic.Suppress:
+                    _setSeverityNoneMenuItem.Checked = true;
+                    break;
+                default:
+                    break;
+            }
         }
 
         private bool AnyDiagnosticsWithSeverity(ReportDiagnostic severity)