From 0ed689d09916dce441f1e7b42aeed6f67024b4e5 Mon Sep 17 00:00:00 2001
From: vchirikov <vchirikov@servicetitan.com>
Date: Wed, 11 Sep 2019 23:34:48 +0300
Subject: [PATCH] feat: Add context menu command

closes #8
---
 package.json                                |  2 +-
 src/GoToDnSpy/GoToDnSpy.cs                  | 19 +++++++----------
 src/GoToDnSpy/GoToDnSpy.csproj              | 10 ++++-----
 src/GoToDnSpy/GoToDnSpyCommands.cs          | 17 ++++++++++-----
 src/GoToDnSpy/GoToDnSpyCommands.vsct        | 23 +++++++++++++++++----
 src/GoToDnSpy/GoToDnSpyPackage.cs           |  9 ++------
 src/GoToDnSpy/MemberType.cs                 | 10 ++++-----
 src/GoToDnSpy/SettingsDialog.cs             | 10 +++++++++
 src/GoToDnSpy/source.extension.cs           |  7 +------
 src/GoToDnSpy/source.extension.vsixmanifest |  2 +-
 10 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 6910c93..07cec1c 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.8",
+  "version": "1.0.9",
   "author": "Vladimir Chirikov",
   "scripts": {
     "install_tools": "npm install -g commitizen cz-conventional-changelog",
diff --git a/src/GoToDnSpy/GoToDnSpy.cs b/src/GoToDnSpy/GoToDnSpy.cs
index ad3544c..1d17210 100644
--- a/src/GoToDnSpy/GoToDnSpy.cs
+++ b/src/GoToDnSpy/GoToDnSpy.cs
@@ -31,16 +31,6 @@ namespace GoToDnSpy
     /// </summary>
     internal sealed partial class GoToDnSpy
     {
-        /// <summary>
-        /// Command ID.
-        /// </summary>
-        public const int CommandId = 0x0100;
-
-        /// <summary>
-        /// Command menu group (command set GUID).
-        /// </summary>
-        public static readonly Guid CommandSet = new Guid("4843d15e-dca8-4935-8ba3-66c4d25fb295");
-
         /// <summary>
         /// VS Package that provides this command, not null.
         /// </summary>
@@ -90,9 +80,14 @@ private GoToDnSpy(Package package)
 
                 if (ServiceProvider.GetService(typeof(IMenuCommandService)) is OleMenuCommandService commandService)
                 {
-                    var menuCommandID = new CommandID(CommandSet, CommandId);
-                    var menuItem = new MenuCommand(this.MenuItemCallback, menuCommandID);
+                    // Add tools menu command
+                    var menuCommandId = new CommandID(PackageGuids.guidGoToDnSpyPackageCmdSetMenu, PackageIds.GoToDnSpyId);
+                    var menuItem = new MenuCommand(this.MenuItemCallback, menuCommandId);
                     commandService.AddCommand(menuItem);
+                    // Add editor context menu command (right click)
+                    var ctxMenuCommand = new CommandID(PackageGuids.guidGoToDnSpyPackageCmdSetContextMenu, PackageIds.GoToDnSpyContextMenuId);
+                    var ctxMenuItem = new MenuCommand(this.MenuItemCallback, ctxMenuCommand);
+                    commandService.AddCommand(ctxMenuItem);
                 }
 
                 _statusBar = (IVsStatusbar)ServiceProvider.GetService(typeof(SVsStatusbar));
diff --git a/src/GoToDnSpy/GoToDnSpy.csproj b/src/GoToDnSpy/GoToDnSpy.csproj
index 568b91b..a1c7df1 100644
--- a/src/GoToDnSpy/GoToDnSpy.csproj
+++ b/src/GoToDnSpy/GoToDnSpy.csproj
@@ -83,6 +83,11 @@
     <VSCTCompile Include="GoToDnSpyCommands.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>
+    <Compile Update="GoToDnSpyCommands.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>GoToDnSpyCommands.vsct</DependentUpon>
+    </Compile>
 
     <EmbeddedResource Update="source.extension.resx">
       <DesignTime>True</DesignTime>
@@ -95,11 +100,6 @@
 
   <!-- [Extensibility Tools generator](https://github.com/madskristensen/ExtensibilityTools) -->
   <ItemGroup Label="Extensibility tools generators">
-    <Compile Update="GoToDnSpyCommands.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>GoToDnSpyCommands.vsct</DependentUpon>
-    </Compile>
 
     <None Update="GoToDnSpyCommands.vsct">
       <Generator>VsctGenerator</Generator>
diff --git a/src/GoToDnSpy/GoToDnSpyCommands.cs b/src/GoToDnSpy/GoToDnSpyCommands.cs
index ad41d95..508784b 100644
--- a/src/GoToDnSpy/GoToDnSpyCommands.cs
+++ b/src/GoToDnSpy/GoToDnSpyCommands.cs
@@ -1,6 +1,6 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
-//     This file was generated by Extensibility Tools v1.10.211
+//     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
 namespace GoToDnSpy
@@ -13,11 +13,16 @@ namespace GoToDnSpy
     internal sealed partial class PackageGuids
     {
         public const string guidGoToDnSpyPackageString = "c827298b-8d81-47c0-bed9-cdf072e68d4f";
-        public const string guidGoToDnSpyPackageCmdSetString = "4843d15e-dca8-4935-8ba3-66c4d25fb295";
-        public const string guidImagesString = "36462768-caed-442f-be73-841d637c2e3b";
         public static Guid guidGoToDnSpyPackage = new Guid(guidGoToDnSpyPackageString);
-        public static Guid guidGoToDnSpyPackageCmdSet = new Guid(guidGoToDnSpyPackageCmdSetString);
+
+        public const string guidGoToDnSpyPackageCmdSetMenuString = "4843d15e-dca8-4935-8ba3-66c4d25fb295";
+        public static Guid guidGoToDnSpyPackageCmdSetMenu = new Guid(guidGoToDnSpyPackageCmdSetMenuString);
+
+        public const string guidImagesString = "36462768-caed-442f-be73-841d637c2e3b";
         public static Guid guidImages = new Guid(guidImagesString);
+
+        public const string guidGoToDnSpyPackageCmdSetContextMenuString = "d5d8efc6-dc17-4229-9088-dddf76ac0ab3";
+        public static Guid guidGoToDnSpyPackageCmdSetContextMenu = new Guid(guidGoToDnSpyPackageCmdSetContextMenuString);
     }
     /// <summary>
     /// Helper class that encapsulates all CommandIDs uses across VS Package.
@@ -27,5 +32,7 @@ internal sealed partial class PackageIds
         public const int MyMenuGroup = 0x1020;
         public const int GoToDnSpyId = 0x0100;
         public const int ico = 0x0001;
+        public const int EditorContextMenuGroup = 0x3020;
+        public const int GoToDnSpyContextMenuId = 0x4020;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GoToDnSpy/GoToDnSpyCommands.vsct b/src/GoToDnSpy/GoToDnSpyCommands.vsct
index c817f05..e0e7424 100644
--- a/src/GoToDnSpy/GoToDnSpyCommands.vsct
+++ b/src/GoToDnSpy/GoToDnSpyCommands.vsct
@@ -36,9 +36,12 @@
          group as the part of a menu contained between two lines. The parent of a group
          must be a menu. -->
     <Groups>
-      <Group guid="guidGoToDnSpyPackageCmdSet" id="MyMenuGroup" priority="0x0600">
+      <Group guid="guidGoToDnSpyPackageCmdSetMenu" id="MyMenuGroup" priority="0x0600">
         <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS"/>
       </Group>
+      <Group guid="guidGoToDnSpyPackageCmdSetContextMenu" id="EditorContextMenuGroup" priority="0x0600">
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_CODEWIN" />
+      </Group>
     </Groups>
 
     <!--Buttons section. -->
@@ -52,8 +55,15 @@
               <CommandFlag>DefaultInvisible</CommandFlag>
               <CommandFlag>DynamicVisibility</CommandFlag>
           If you do not want an image next to your command, remove the Icon node /> -->
-      <Button guid="guidGoToDnSpyPackageCmdSet" id="GoToDnSpyId" priority="0x0100" type="Button">
-        <Parent guid="guidGoToDnSpyPackageCmdSet" id="MyMenuGroup" />
+      <Button guid="guidGoToDnSpyPackageCmdSetMenu" id="GoToDnSpyId" priority="0x0100" type="Button">
+        <Parent guid="guidGoToDnSpyPackageCmdSetMenu" id="MyMenuGroup" />
+        <Icon guid="guidImages" id="ico" />
+        <Strings>
+          <ButtonText>GoTo dnSpy...</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidGoToDnSpyPackageCmdSetContextMenu" id="GoToDnSpyContextMenuId" priority="0x0100" type="Button">
+        <Parent guid="guidGoToDnSpyPackageCmdSetContextMenu" id="EditorContextMenuGroup" />
         <Icon guid="guidImages" id="ico" />
         <Strings>
           <ButtonText>GoTo dnSpy...</ButtonText>
@@ -77,7 +87,7 @@
     <GuidSymbol name="guidGoToDnSpyPackage" value="{c827298b-8d81-47c0-bed9-cdf072e68d4f}" />
 
     <!-- This is the guid used to group the menu commands together -->
-    <GuidSymbol name="guidGoToDnSpyPackageCmdSet" value="{4843d15e-dca8-4935-8ba3-66c4d25fb295}">
+    <GuidSymbol name="guidGoToDnSpyPackageCmdSetMenu" value="{4843d15e-dca8-4935-8ba3-66c4d25fb295}">
       <IDSymbol name="MyMenuGroup" value="0x1020" />
       <IDSymbol name="GoToDnSpyId" value="0x0100" />
     </GuidSymbol>
@@ -85,5 +95,10 @@
     <GuidSymbol name="guidImages" value="{36462768-caed-442f-be73-841d637c2e3b}" >
       <IDSymbol name="ico" value="1" />
     </GuidSymbol>
+
+    <GuidSymbol name="guidGoToDnSpyPackageCmdSetContextMenu" value="{d5d8efc6-dc17-4229-9088-dddf76ac0ab3}">
+      <IDSymbol value="0x3020" name="EditorContextMenuGroup" />
+      <IDSymbol value="0x4020" name="GoToDnSpyContextMenuId" />
+    </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/src/GoToDnSpy/GoToDnSpyPackage.cs b/src/GoToDnSpy/GoToDnSpyPackage.cs
index 31dc125..75c8b58 100644
--- a/src/GoToDnSpy/GoToDnSpyPackage.cs
+++ b/src/GoToDnSpy/GoToDnSpyPackage.cs
@@ -32,16 +32,11 @@ namespace GoToDnSpy
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] // Info on this package for Help/About
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [Guid(GoToDnSpyPackage.PackageGuidString)]
+    [Guid(PackageGuids.guidGoToDnSpyPackageString)]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
-    [ProvideOptionPage(typeof(SettingsDialog), "GoTo dnSpy", "General", 0, 0, true)]
+    [ProvideOptionPage(typeof(SettingsDialog), "GoTo dnSpy", "General", 0, 0, supportsAutomation: true)]
     public sealed class GoToDnSpyPackage : Package
     {
-        /// <summary>
-        /// GoToDnSpyPackage GUID string.
-        /// </summary>
-        public const string PackageGuidString = "c827298b-8d81-47c0-bed9-cdf072e68d4f";
-
         /// <summary>
         /// Initializes a new instance of the <see cref="GoToDnSpy"/> class.
         /// </summary>
diff --git a/src/GoToDnSpy/MemberType.cs b/src/GoToDnSpy/MemberType.cs
index a171d35..18ef324 100644
--- a/src/GoToDnSpy/MemberType.cs
+++ b/src/GoToDnSpy/MemberType.cs
@@ -1,10 +1,10 @@
 namespace GoToDnSpy
 {
-    enum MemberType
+    internal enum MemberType
     {
-        Field,
-        Property,
-        Method,
-        Event,
+        Field = 0,
+        Property = 1,
+        Method = 2,
+        Event = 3,
     }
 }
diff --git a/src/GoToDnSpy/SettingsDialog.cs b/src/GoToDnSpy/SettingsDialog.cs
index a325aa4..6ea2e90 100644
--- a/src/GoToDnSpy/SettingsDialog.cs
+++ b/src/GoToDnSpy/SettingsDialog.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using Microsoft.VisualStudio.Shell;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 
 namespace GoToDnSpy
 {
@@ -16,5 +17,14 @@ public class SettingsDialog : DialogPage
         [DisplayName("dnSpy path")]
         [Description("Path to dnSpy.exe. Example: C:\\dnSpy\\dnSpy.exe")]
         public string DnSpyPath { get; set;}
+
+        /// <summary>
+        /// Mode was added recently in new version <see cref="DialogPage"/> ?
+        /// So this is workaround for removing it from settings property grid
+        /// </summary>
+        [Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public uint Mode => 1337;
     }
 }
diff --git a/src/GoToDnSpy/source.extension.cs b/src/GoToDnSpy/source.extension.cs
index 65693a2..293c4dd 100644
--- a/src/GoToDnSpy/source.extension.cs
+++ b/src/GoToDnSpy/source.extension.cs
@@ -1,8 +1,3 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This file was generated by Extensibility Tools v1.10.211
-// </auto-generated>
-// ------------------------------------------------------------------------------
 namespace GoToDnSpy
 {
     static class Vsix
@@ -11,7 +6,7 @@ static class Vsix
         public const string Name = "GoToDnSpy";
         public const string Description = @"Open dnSpy and select method or type under caret.";
         public const string Language = "en-US";
-        public const string Version = "1.0.8";
+        public const string Version = "1.0.9";
         public const string Author = "Vladimir Chirikov";
         public const string Tags = "GoToDnSpy, GoTo, Disasm, ILSpy, ILDisasm, Disassemble, CIL, IL, MSIL, dnSpy, de4dot, dnlib, decompile, Emit";
     }
diff --git a/src/GoToDnSpy/source.extension.vsixmanifest b/src/GoToDnSpy/source.extension.vsixmanifest
index aab6810..1b8d1cd 100644
--- a/src/GoToDnSpy/source.extension.vsixmanifest
+++ b/src/GoToDnSpy/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="GoToDnSpy" Version="1.0.8" Language="en-US" Publisher="Vladimir Chirikov" />
+        <Identity Id="GoToDnSpy" Version="1.0.9" Language="en-US" Publisher="Vladimir Chirikov" />
         <DisplayName>GoToDnSpy</DisplayName>
         <Description xml:space="preserve">Open dnSpy and select method or type under caret.</Description>
         <MoreInfo>https://github.com/vchirikov/GoToDnSpy</MoreInfo>