"Check selected items" -> "Check selected projects"

Author: VioletGiraffe

CPPCheckPlugin/CPPCheckPlugin.vsct

@@ -95,7 +95,7 @@
         <Parent guid="guidCPPCheckPluginCmdSet" id="MyMenuGroup" />
         <Icon guid="guidImages" id="bmpPic1" />
         <Strings>
-          <ButtonText>Check selected items</ButtonText>
+          <ButtonText>Check selected projects</ButtonText>
         </Strings>
       </Button>
 
@@ -136,7 +136,7 @@
         <Parent guid="guidCPPCheckPluginMultiItemCmdSet" id="MyMultiItemMenuGroup" />
         <Icon guid="guidImages" id="bmpPic1" />
         <Strings>
-          <ButtonText>CPPCheck selected items</ButtonText>
+          <ButtonText>CPPCheck selected projects</ButtonText>
         </Strings>
       </Button>
 

CPPCheckPlugin/CPPCheckPluginPackage.cs

@@ -164,54 +164,58 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
 			// Add our command handlers for menu (commands must exist in the .vsct file)
 			OleMenuCommandService mcs = await GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
-			if (null != mcs)
+			if (mcs == null)
 			{
-				// Create the command for the menu item.
-				{
-					CommandID menuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidCheckProjectCppcheck);
-					menuCheckCurrentProject = new MenuCommand(onCheckCurrentProjectRequested, menuCommandID);
-					mcs.AddCommand(menuCheckCurrentProject);
-				}
+				Debug.Assert(mcs != null);
+				return;
+			}
 
-				{
-					// Create the command for the settings window
-					CommandID settingsWndCmdId = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidSettings);
-					menuShowSettingsWindow = new MenuCommand(onSettingsWindowRequested, settingsWndCmdId);
-					mcs.AddCommand(menuShowSettingsWindow);
-				}
+
+			// Create the command for the menu item.
+			{
+				CommandID menuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidCheckProjectCppcheck);
+				menuCheckCurrentProject = new MenuCommand(onCheckCurrentProjectRequested, menuCommandID);
+				mcs.AddCommand(menuCheckCurrentProject);
+			}
 
-				{
-					CommandID stopCheckMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidStopCppcheck);
-					menuCancelCheck = new MenuCommand(onStopCheckRequested, stopCheckMenuCommandID);
-					mcs.AddCommand(menuCancelCheck);
-				}
+			{
+				// Create the command for the settings window
+				CommandID settingsWndCmdId = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidSettings);
+				menuShowSettingsWindow = new MenuCommand(onSettingsWindowRequested, settingsWndCmdId);
+				mcs.AddCommand(menuShowSettingsWindow);
+			}
 
-				{
-					CommandID selectionsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidCheckMultiItemCppcheck);
-					menuCheckSelections = new MenuCommand(onCheckSelectionsRequested, selectionsMenuCommandID);
-					mcs.AddCommand(menuCheckSelections);
-				}
+			{
+				CommandID stopCheckMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidStopCppcheck);
+				menuCancelCheck = new MenuCommand(onStopCheckRequested, stopCheckMenuCommandID);
+				mcs.AddCommand(menuCancelCheck);
+			}
 
-				{
-					CommandID projectMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginProjectCmdSet, (int)PkgCmdIDList.cmdidCheckProjectCppcheck1);
-					menuCheckCurrentProjectContext = new MenuCommand(onCheckCurrentProjectRequested, projectMenuCommandID);
-					mcs.AddCommand(menuCheckCurrentProjectContext);
-				}
+			{
+				CommandID selectionsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginCmdSet, (int)PkgCmdIDList.cmdidCheckMultiItemCppcheck);
+				menuCheckSelections = new MenuCommand(onCheckSelectionsRequested, selectionsMenuCommandID);
+				mcs.AddCommand(menuCheckSelections);
+			}
 
-				{
-					CommandID projectsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginMultiProjectCmdSet, (int)PkgCmdIDList.cmdidCheckProjectsCppcheck);
-					menuCheckCurrentProjectsContext = new MenuCommand(onCheckAllProjectsRequested, projectsMenuCommandID);
-					mcs.AddCommand(menuCheckCurrentProjectsContext);
-				}
+			{
+				CommandID projectMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginProjectCmdSet, (int)PkgCmdIDList.cmdidCheckProjectCppcheck1);
+				menuCheckCurrentProjectContext = new MenuCommand(onCheckCurrentProjectRequested, projectMenuCommandID);
+				mcs.AddCommand(menuCheckCurrentProjectContext);
+			}
 
-				{
-					CommandID selectionsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginMultiItemProjectCmdSet, (int)PkgCmdIDList.cmdidCheckMultiItemCppcheck1);
-					checkMultiSelections = new MenuCommand(onCheckSelectionsRequested, selectionsMenuCommandID);
-					mcs.AddCommand(checkMultiSelections);
-				}
+			{
+				CommandID projectsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginMultiProjectCmdSet, (int)PkgCmdIDList.cmdidCheckProjectsCppcheck);
+				menuCheckCurrentProjectsContext = new MenuCommand(onCheckAllProjectsRequested, projectsMenuCommandID);
+				mcs.AddCommand(menuCheckCurrentProjectsContext);
+			}
 
-				setMenuState(false);
+			{
+				CommandID selectionsMenuCommandID = new CommandID(GuidList.guidCPPCheckPluginMultiItemProjectCmdSet, (int)PkgCmdIDList.cmdidCheckMultiItemCppcheck1);
+				checkMultiSelections = new MenuCommand(onCheckSelectionsRequested, selectionsMenuCommandID);
+				mcs.AddCommand(checkMultiSelections);
 			}
+
+			setMenuState(false);
 		}
 
 		protected override void Dispose(bool disposing)