From 79bc9de904e97cf80cc5bb811dcafd8473a750f0 Mon Sep 17 00:00:00 2001
From: Andreas Weizel <rpinski@awzhome.de>
Date: Sun, 18 Jul 2021 13:35:15 +0200
Subject: [PATCH] Combine all "Open reference" commands to avoid duplicate code

---
 ILSpy.AddIn/Commands/OpenReferenceCommand.cs |  8 ++++----
 ILSpy.AddIn/ILSpyAddIn.en-US.vsct            | 20 --------------------
 ILSpy.AddIn/ILSpyAddIn.vsct                  | 18 ++++++++----------
 ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct          | 20 --------------------
 ILSpy.AddIn/ILSpyAddInPackage.cs             |  4 +---
 ILSpy.AddIn/PkgCmdID.cs                      |  2 --
 6 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/ILSpy.AddIn/Commands/OpenReferenceCommand.cs b/ILSpy.AddIn/Commands/OpenReferenceCommand.cs
index 5a9675161..953bc5a67 100644
--- a/ILSpy.AddIn/Commands/OpenReferenceCommand.cs
+++ b/ILSpy.AddIn/Commands/OpenReferenceCommand.cs
@@ -13,8 +13,8 @@ namespace ICSharpCode.ILSpy.AddIn.Commands
 	{
 		static OpenReferenceCommand instance;
 
-		public OpenReferenceCommand(ILSpyAddInPackage owner, uint id)
-			: base(owner, id)
+		public OpenReferenceCommand(ILSpyAddInPackage owner)
+			: base(owner, PkgCmdIDList.cmdidOpenReferenceInILSpy)
 		{
 			ThreadHelper.ThrowIfNotOnUIThread();
 		}
@@ -98,11 +98,11 @@ namespace ICSharpCode.ILSpy.AddIn.Commands
 			}
 		}
 
-		internal static void Register(ILSpyAddInPackage owner, uint id)
+		internal static void Register(ILSpyAddInPackage owner)
 		{
 			ThreadHelper.ThrowIfNotOnUIThread();
 
-			instance = new OpenReferenceCommand(owner, id);
+			instance = new OpenReferenceCommand(owner);
 		}
 	}
 
diff --git a/ILSpy.AddIn/ILSpyAddIn.en-US.vsct b/ILSpy.AddIn/ILSpyAddIn.en-US.vsct
index e3fc05868..e52c29d25 100644
--- a/ILSpy.AddIn/ILSpyAddIn.en-US.vsct
+++ b/ILSpy.AddIn/ILSpyAddIn.en-US.vsct
@@ -57,26 +57,6 @@
         </Strings>
       </Button>
       
-      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenPackageReferenceInILSpy" priority="0x0600" type="Button">
-        <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyPackageRefGroup" />
-        <Icon guid="guidImages" id="bmpLogo" />
-        <CommandFlag>DynamicVisibility</CommandFlag>
-        <CommandFlag>DefaultInvisible</CommandFlag>
-        <Strings>
-          <ButtonText>Open in ILSpy</ButtonText>
-        </Strings>
-      </Button>
-
-      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenProjectReferenceInILSpy" priority="0x0600" type="Button">
-        <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyProjectRefGroup" />
-        <Icon guid="guidImages" id="bmpLogo" />
-        <CommandFlag>DynamicVisibility</CommandFlag>
-        <CommandFlag>DefaultInvisible</CommandFlag>
-        <Strings>
-          <ButtonText>Open in ILSpy</ButtonText>
-        </Strings>
-      </Button>
-
       <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenProjectOutputInILSpy" priority="0x0600" type="Button">
         <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyProjGroup" />
         <Icon guid="guidImages" id="bmpLogo" />
diff --git a/ILSpy.AddIn/ILSpyAddIn.vsct b/ILSpy.AddIn/ILSpyAddIn.vsct
index 9623163ca..b95259168 100644
--- a/ILSpy.AddIn/ILSpyAddIn.vsct
+++ b/ILSpy.AddIn/ILSpyAddIn.vsct
@@ -52,14 +52,6 @@
       <Group guid="guidILSpyAddInCmdSet" id="OpenILSpyRefGroup" priority="0x0200">
         <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_REFERENCE"/>
       </Group>
-
-      <Group guid="guidILSpyAddInCmdSet" id="OpenILSpyPackageRefGroup" priority="0x0200">
-        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PACKAGEREFERENCE"/>
-      </Group>
-      
-      <Group guid="guidILSpyAddInCmdSet" id="OpenILSpyProjectRefGroup" priority="0x0200">
-        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJECTREFERENCE"/>
-      </Group>
     </Groups>
 
     <!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
@@ -72,6 +64,14 @@
       <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpLogo, bmpPic1, bmpPic2, bmpPicX, bmpPicArrows"/>
     </Bitmaps>
   </Commands>
+  <CommandPlacements>
+    <CommandPlacement guid="guidILSpyAddInCmdSet" id="OpenILSpyRefGroup" priority="0x0200">
+      <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PACKAGEREFERENCE"/>
+    </CommandPlacement>
+    <CommandPlacement guid="guidILSpyAddInCmdSet" id="OpenILSpyRefGroup" priority="0x0200">
+      <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJECTREFERENCE"/>
+    </CommandPlacement>
+  </CommandPlacements>
   <Symbols>
     <!-- This is the package guid. -->
     <GuidSymbol name="guidILSpyAddInPkg" value="{a9120dbe-164a-4891-842f-fb7829273838}" />
@@ -89,8 +89,6 @@
       <IDSymbol name="cmdidOpenReferenceInILSpy" value="0x0200" />
       <IDSymbol name="cmdidOpenProjectOutputInILSpy" value="0x0300" />
       <IDSymbol name="cmdidOpenCodeItemInILSpy" value="0x0400" />
-      <IDSymbol name="cmdidOpenPackageReferenceInILSpy" value="0x0500" />
-      <IDSymbol name="cmdidOpenProjectReferenceInILSpy" value="0x0600" />
     </GuidSymbol>
 
     <GuidSymbol name="guidImages" value="{2f654db9-4641-4638-9937-27c6202b2a6a}" >
diff --git a/ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct b/ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct
index 62b235d96..406299119 100644
--- a/ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct
+++ b/ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct
@@ -57,26 +57,6 @@
         </Strings>
       </Button>
 
-      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenPackageReferenceInILSpy" priority="0x0600" type="Button">
-        <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyPackageRefGroup" />
-        <Icon guid="guidImages" id="bmpLogo" />
-        <CommandFlag>DynamicVisibility</CommandFlag>
-        <CommandFlag>DefaultInvisible</CommandFlag>
-        <Strings>
-          <ButtonText>用 ILSpy 打开</ButtonText>
-        </Strings>
-      </Button>
-      
-      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenProjectReferenceInILSpy" priority="0x0600" type="Button">
-        <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyProjectRefGroup" />
-        <Icon guid="guidImages" id="bmpLogo" />
-        <CommandFlag>DynamicVisibility</CommandFlag>
-        <CommandFlag>DefaultInvisible</CommandFlag>
-        <Strings>
-          <ButtonText>用 ILSpy 打开</ButtonText>
-        </Strings>
-      </Button>
-
       <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenProjectOutputInILSpy" priority="0x0600" type="Button">
         <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyProjGroup" />
         <Icon guid="guidImages" id="bmpLogo" />
diff --git a/ILSpy.AddIn/ILSpyAddInPackage.cs b/ILSpy.AddIn/ILSpyAddInPackage.cs
index 61ce4528a..195940b68 100644
--- a/ILSpy.AddIn/ILSpyAddInPackage.cs
+++ b/ILSpy.AddIn/ILSpyAddInPackage.cs
@@ -94,9 +94,7 @@ namespace ICSharpCode.ILSpy.AddIn
 
 			OpenILSpyCommand.Register(this);
 			OpenProjectOutputCommand.Register(this);
-			OpenReferenceCommand.Register(this, PkgCmdIDList.cmdidOpenReferenceInILSpy);
-			OpenReferenceCommand.Register(this, PkgCmdIDList.cmdidOpenPackageReferenceInILSpy);
-			OpenReferenceCommand.Register(this, PkgCmdIDList.cmdidOpenProjectReferenceInILSpy);
+			OpenReferenceCommand.Register(this);
 			OpenCodeItemCommand.Register(this);
 		}
 		#endregion
diff --git a/ILSpy.AddIn/PkgCmdID.cs b/ILSpy.AddIn/PkgCmdID.cs
index 932e40932..841381a51 100644
--- a/ILSpy.AddIn/PkgCmdID.cs
+++ b/ILSpy.AddIn/PkgCmdID.cs
@@ -9,7 +9,5 @@ namespace ICSharpCode.ILSpy.AddIn
 		public const uint cmdidOpenReferenceInILSpy = 0x200;
 		public const uint cmdidOpenProjectOutputInILSpy = 0x300;
 		public const uint cmdidOpenCodeItemInILSpy = 0x0400;
-		public const uint cmdidOpenPackageReferenceInILSpy = 0x500;
-		public const uint cmdidOpenProjectReferenceInILSpy = 0x600;
 	};
 }
\ No newline at end of file