From 0a97babc04b871af124a44e799c93af554657112 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 7 Sep 2016 17:38:29 -0700
Subject: [PATCH 1/3] Add SendFeedback menu item for NTVS

Adds a simple menu item to send feedback about ntvs. See #1252 for details

Closes #1252
---
 .../Nodejs/Commands/SendFeedbackCommand.cs    | 32 +++++++++++++++++++
 Nodejs/Product/Nodejs/Nodejs.csproj           |  1 +
 Nodejs/Product/Nodejs/NodejsPackage.cs        |  3 +-
 Nodejs/Product/Nodejs/NodejsTools.vsct        |  8 +++++
 Nodejs/Product/Nodejs/PkgCmdId.cs             | 10 +++---
 5 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs

diff --git a/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs b/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs
new file mode 100644
index 000000000..2473caae8
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs
@@ -0,0 +1,32 @@
+//*********************************************************//
+//    Copyright (c) Microsoft. All rights reserved.
+//    
+//    Apache 2.0 License
+//    
+//    You may obtain a copy of the License at
+//    http://www.apache.org/licenses/LICENSE-2.0
+//    
+//    Unless required by applicable law or agreed to in writing, software 
+//    distributed under the License is distributed on an "AS IS" BASIS, 
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+//    implied. See the License for the specific language governing 
+//    permissions and limitations under the License.
+//
+//*********************************************************//
+
+using System;
+using Microsoft.VisualStudioTools;
+using System.Diagnostics;
+
+namespace Microsoft.NodejsTools.Commands {
+    internal sealed class SendFeedbackCommand : Command {
+        public override void DoCommand(object sender, EventArgs args) {
+            var uri = new Uri(@"https://aka.ms/ntvs-feedback");
+            Process.Start(new ProcessStartInfo(uri.AbsoluteUri));
+        }
+
+        public override int CommandId {
+            get { return (int)PkgCmdId.cmdidSendFeedback; }
+        }
+    }
+}
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
index d52bbb1ff..2067e47bc 100644
--- a/Nodejs/Product/Nodejs/Nodejs.csproj
+++ b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -230,6 +230,7 @@
       <DependentUpon>DiagnosticsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Commands\ImportWizardCommand.cs" />
+    <Compile Include="Commands\SendFeedbackCommand.cs" />
     <Compile Include="Commands\OpenReplWindowCommand.cs" />
     <Compile Include="Commands\OpenRemoteDebugDocumentationCommand.cs" />
     <Compile Include="Commands\OpenRemoteDebugProxyFolderCommand.cs" />
diff --git a/Nodejs/Product/Nodejs/NodejsPackage.cs b/Nodejs/Product/Nodejs/NodejsPackage.cs
index 516c9d297..5035912dc 100644
--- a/Nodejs/Product/Nodejs/NodejsPackage.cs
+++ b/Nodejs/Product/Nodejs/NodejsPackage.cs
@@ -215,7 +215,8 @@ protected override void Initialize() {
                 new OpenRemoteDebugDocumentationCommand(),
                 new SurveyNewsCommand(),
                 new ImportWizardCommand(),
-                new DiagnosticsCommand(this)
+                new DiagnosticsCommand(this),
+                new SendFeedbackCommand()
             };
             try {
                 commands.Add(new AzureExplorerAttachDebuggerCommand());
diff --git a/Nodejs/Product/Nodejs/NodejsTools.vsct b/Nodejs/Product/Nodejs/NodejsTools.vsct
index 9eed30a3f..750936812 100644
--- a/Nodejs/Product/Nodejs/NodejsTools.vsct
+++ b/Nodejs/Product/Nodejs/NodejsTools.vsct
@@ -91,6 +91,13 @@
               <CommandFlag>DynamicVisibility</CommandFlag>
           If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->
 
+       <Button guid="guidNodeToolsCmdSet" id="cmdidSendFeedback" priority="0x0500" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_HELP_SUPPORT"/>
+        <Strings>
+          <ButtonText>Report Node.js Tools Issue or Send Feedback</ButtonText>
+        </Strings>
+      </Button>
+        
       <Button guid="guidNodeToolsCmdSet" id="cmdidAddNewJavaScriptFileCommand" priority="0x0550" type="Button">
         <Parent guid="guidNodeToolsCmdSet" id="AddNewFileGroup"/>
         <Strings>
@@ -400,6 +407,7 @@
       <IDSymbol name="cmdidAddNewTypeScriptFileCommand" value="0x0212" />
       <IDSymbol name="cmdidAddNewHTMLFileCommand" value="0x0213" />
       <IDSymbol name="cmdidAddNewCSSFileCommand" value="0x0214" />
+      <IDSymbol name="cmdidSendFeedback" value="0x0215" />
 
       <!-- Shared commands, defined in CommonConstants.cs -->
       <IDSymbol name="cmdidAddExistingFolder" value="0x10001" />
diff --git a/Nodejs/Product/Nodejs/PkgCmdId.cs b/Nodejs/Product/Nodejs/PkgCmdId.cs
index a864579b8..9b9f9fa14 100644
--- a/Nodejs/Product/Nodejs/PkgCmdId.cs
+++ b/Nodejs/Product/Nodejs/PkgCmdId.cs
@@ -31,10 +31,11 @@ class PkgCmdId {
         public const int cmdidDiagnostics                   = 0x208;
         public const int cmdidSetAsContent                  = 0x209;
         public const int cmdidSetAsCompile                  = 0x210;
-		public const int cmdidAddNewJavaScriptFileCommand   = 0x211;  
-		public const int cmdidAddNewTypeScriptFileCommand   = 0x212;  
-		public const int cmdidAddNewHTMLFileCommand         = 0x213;  
-		public const int cmdidAddNewCSSFileCommand          = 0x214;  
+        public const int cmdidAddNewJavaScriptFileCommand   = 0x211;
+        public const int cmdidAddNewTypeScriptFileCommand   = 0x212;
+        public const int cmdidAddNewHTMLFileCommand         = 0x213;
+        public const int cmdidAddNewCSSFileCommand          = 0x214;
+        public const int cmdidSendFeedback                  = 0x215;
 
 
         public const int cmdidNpmManageModules              = 0x300;
@@ -47,4 +48,3 @@ class PkgCmdId {
         public const int menuIdNpm                          = 0x3000;
     }
 }
-

From 62292944b74c54e6736538ad308cd180a2a1f944 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 9 Sep 2016 14:41:52 -0700
Subject: [PATCH 2/3] Move send feedback to NTVS menu. Add documentaiton link

---
 .../Nodejs/Commands/SendFeedbackCommand.cs    |  5 ++-
 Nodejs/Product/Nodejs/Nodejs.csproj           |  1 +
 Nodejs/Product/Nodejs/NodejsPackage.cs        |  3 +-
 Nodejs/Product/Nodejs/NodejsTools.vsct        | 31 ++++++++++++++-----
 Nodejs/Product/Nodejs/PkgCmdId.cs             |  2 +-
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs b/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs
index 2473caae8..e3718871c 100644
--- a/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs
+++ b/Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs
@@ -15,14 +15,13 @@
 //*********************************************************//
 
 using System;
-using Microsoft.VisualStudioTools;
 using System.Diagnostics;
+using Microsoft.VisualStudioTools;
 
 namespace Microsoft.NodejsTools.Commands {
     internal sealed class SendFeedbackCommand : Command {
         public override void DoCommand(object sender, EventArgs args) {
-            var uri = new Uri(@"https://aka.ms/ntvs-feedback");
-            Process.Start(new ProcessStartInfo(uri.AbsoluteUri));
+            Process.Start(@"https://aka.ms/ntvs-feedback");
         }
 
         public override int CommandId {
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
index ba61f1127..ea4d8e344 100644
--- a/Nodejs/Product/Nodejs/Nodejs.csproj
+++ b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -234,6 +234,7 @@
     <Compile Include="Commands\OpenReplWindowCommand.cs" />
     <Compile Include="Commands\OpenRemoteDebugDocumentationCommand.cs" />
     <Compile Include="Commands\OpenRemoteDebugProxyFolderCommand.cs" />
+    <Compile Include="Commands\ShowDocumentationCommand.cs" />
     <Compile Include="Commands\SurveyNewsCommand.cs" />
     <Compile Include="Debugger\DataTips\DataTipTextManagerEvents.cs" />
     <Compile Include="Debugger\DebugEngine\AD7EvalErrorProperty.cs" />
diff --git a/Nodejs/Product/Nodejs/NodejsPackage.cs b/Nodejs/Product/Nodejs/NodejsPackage.cs
index 1a8106c57..a690780e9 100644
--- a/Nodejs/Product/Nodejs/NodejsPackage.cs
+++ b/Nodejs/Product/Nodejs/NodejsPackage.cs
@@ -212,7 +212,8 @@ protected override void Initialize() {
                 new SurveyNewsCommand(),
                 new ImportWizardCommand(),
                 new DiagnosticsCommand(this),
-                new SendFeedbackCommand()
+                new SendFeedbackCommand(),
+                new ShowDocumentationCommand()
             };
             try {
                 commands.Add(new AzureExplorerAttachDebuggerCommand());
diff --git a/Nodejs/Product/Nodejs/NodejsTools.vsct b/Nodejs/Product/Nodejs/NodejsTools.vsct
index 750936812..8c51fc648 100644
--- a/Nodejs/Product/Nodejs/NodejsTools.vsct
+++ b/Nodejs/Product/Nodejs/NodejsTools.vsct
@@ -36,6 +36,10 @@
         <Parent guid="guidNodeToolsCmdSet" id="RemoteDebugProxyMenu"/>
       </Group>
 
+      <Group guid="guidNodeToolsCmdSet" id="NtvsHelpGroup" priority="0x0500">
+        <Parent guid="guidNodeToolsCmdSet" id="ToolsMenu"/>
+      </Group>
+
       <Group guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJWIN_SCOPE" priority="0x0500">
         <Parent guid="guidNodeToolsNpmCmdSet" id="NpmMenu"/>
       </Group>
@@ -90,13 +94,6 @@
               <CommandFlag>DefaultInvisible</CommandFlag>
               <CommandFlag>DynamicVisibility</CommandFlag>
           If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->
-
-       <Button guid="guidNodeToolsCmdSet" id="cmdidSendFeedback" priority="0x0500" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_HELP_SUPPORT"/>
-        <Strings>
-          <ButtonText>Report Node.js Tools Issue or Send Feedback</ButtonText>
-        </Strings>
-      </Button>
         
       <Button guid="guidNodeToolsCmdSet" id="cmdidAddNewJavaScriptFileCommand" priority="0x0550" type="Button">
         <Parent guid="guidNodeToolsCmdSet" id="AddNewFileGroup"/>
@@ -225,14 +222,30 @@
         </Strings>
       </Button>
 
+      <Button guid="guidNodeToolsCmdSet" id="cmdidDocumentation" priority="0x004" type="Button">
+        <Parent guid="guidNodeToolsCmdSet" id="NtvsHelpGroup"/>
+        <Strings>
+          <ButtonText>&amp;Documentation...</ButtonText>
+          <CommandName>Documentation...</CommandName>
+        </Strings>
+      </Button>
+
       <Button guid="guidNodeToolsCmdSet" id="cmdidSurveyNews" priority="0x005" type="Button">
-        <Parent guid="guidNodeToolsCmdSet" id="ToolsMenuItemsGroup"/>
+        <Parent guid="guidNodeToolsCmdSet" id="NtvsHelpGroup"/>
         <Strings>
           <ButtonText>Survey/&amp;News...</ButtonText>
           <CommandName>Survey/News...</CommandName>
         </Strings>
       </Button>
 
+      <Button guid="guidNodeToolsCmdSet" id="cmdidSendFeedback" priority="0x006" type="Button">
+        <Parent guid="guidNodeToolsCmdSet" id="NtvsHelpGroup"/>
+        <Strings>
+          <ButtonText>&amp;Report Issue or Send Feedback...</ButtonText>
+          <CommandName>Report Issue or Send Feedback...</CommandName>
+        </Strings>
+      </Button>
+
       <Button guid="guidNodeToolsNpmCmdSet" id="cmdidNpmManageModules" priority="0x8000" type="Button">
         <Parent guid="guidNodeToolsNpmCmdSet" id="NpmGroup" />
         <CommandFlag>DefaultInvisible</CommandFlag>
@@ -408,6 +421,7 @@
       <IDSymbol name="cmdidAddNewHTMLFileCommand" value="0x0213" />
       <IDSymbol name="cmdidAddNewCSSFileCommand" value="0x0214" />
       <IDSymbol name="cmdidSendFeedback" value="0x0215" />
+      <IDSymbol name="cmdidDocumentation" value="0x0216" />
 
       <!-- Shared commands, defined in CommonConstants.cs -->
       <IDSymbol name="cmdidAddExistingFolder" value="0x10001" />
@@ -420,6 +434,7 @@
       <IDSymbol name="CodeFileGroup" value="0x1012" />
       <IDSymbol name="AzureExplorerCommandsGroup" value="0x1015" />
       <IDSymbol name="AddNewFileGroup" value="0x1016"/>
+      <IDSymbol name="NtvsHelpGroup" value="0x1017" />
 
       <!-- Menus -->
       <IDSymbol name="ToolsMenu" value ="0x2001" />
diff --git a/Nodejs/Product/Nodejs/PkgCmdId.cs b/Nodejs/Product/Nodejs/PkgCmdId.cs
index 9b9f9fa14..35aba8a45 100644
--- a/Nodejs/Product/Nodejs/PkgCmdId.cs
+++ b/Nodejs/Product/Nodejs/PkgCmdId.cs
@@ -36,7 +36,7 @@ class PkgCmdId {
         public const int cmdidAddNewHTMLFileCommand         = 0x213;
         public const int cmdidAddNewCSSFileCommand          = 0x214;
         public const int cmdidSendFeedback                  = 0x215;
-
+        public const int cmdidShowDocumentation             = 0x216;
 
         public const int cmdidNpmManageModules              = 0x300;
         public const int cmdidNpmInstallModules             = 0x301;

From 40c6f977d95211a8268eccfbe63638b23c89507d Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 9 Sep 2016 14:42:14 -0700
Subject: [PATCH 3/3] Add documentation command

---
 .../Commands/ShowDocumentationCommand.cs      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Nodejs/Product/Nodejs/Commands/ShowDocumentationCommand.cs

diff --git a/Nodejs/Product/Nodejs/Commands/ShowDocumentationCommand.cs b/Nodejs/Product/Nodejs/Commands/ShowDocumentationCommand.cs
new file mode 100644
index 000000000..b431f4fe6
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Commands/ShowDocumentationCommand.cs
@@ -0,0 +1,31 @@
+//*********************************************************//
+//    Copyright (c) Microsoft. All rights reserved.
+//    
+//    Apache 2.0 License
+//    
+//    You may obtain a copy of the License at
+//    http://www.apache.org/licenses/LICENSE-2.0
+//    
+//    Unless required by applicable law or agreed to in writing, software 
+//    distributed under the License is distributed on an "AS IS" BASIS, 
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+//    implied. See the License for the specific language governing 
+//    permissions and limitations under the License.
+//
+//*********************************************************//
+
+using System;
+using System.Diagnostics;
+using Microsoft.VisualStudioTools;
+
+namespace Microsoft.NodejsTools.Commands {
+    internal sealed class ShowDocumentationCommand : Command {
+        public override void DoCommand(object sender, EventArgs args) {
+            Process.Start(@"https://go.microsoft.com/fwlink/?linkid=785972");
+        }
+
+        public override int CommandId {
+            get { return (int)PkgCmdId.cmdidShowDocumentation; }
+        }
+    }
+}