Merge pull request #1581 from paulvanbrenk/15.3rollup

15.3 rollup

Author: paulvanbrenk

Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Thread.cs

@@ -40,7 +40,7 @@ internal NodeThread GetDebuggedThread()
         // NOTE: VS2013 and earlier do not use the result to disable the "set next statement" command
         int IDebugThread2.CanSetNextStatement(IDebugStackFrame2 stackFrame, IDebugCodeContext2 codeContext)
         {
-            throw new NotSupportedException("Set Next Statement is not supported by Node.js.");
+            return VSConstants.E_NOTIMPL;
         }
 
         // Retrieves a list of the stack frames for this thread.

Nodejs/Product/Nodejs/Debugger/NodeDebugProvider.cs

@@ -2,10 +2,14 @@
 
 using System;
 using System.ComponentModel.Composition;
+using System.IO;
+using Microsoft.NodejsTools.Project;
+using Microsoft.VisualStudio.Setup.Configuration;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Workspace;
 using Microsoft.VisualStudio.Workspace.Debug;
 using Microsoft.VisualStudio.Workspace.Extensions.VS.Debug;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.NodejsTools.Debugger
 {
@@ -42,9 +46,24 @@ internal class NodeJsDebugLaunchProvider : IVsDebugLaunchTargetProvider
 }";
 
         public void SetupDebugTargetInfo(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext)
+        {
+            var nodeExe = debugLaunchContext.LaunchConfiguration.GetValue<string>(NodeExeKey, defaultValue: Nodejs.GetPathToNodeExecutableFromEnvironment());
+
+            var nodeVersion = Nodejs.GetNodeVersion(nodeExe);
+            if (nodeVersion >= new Version(8, 0) || NodejsProjectLauncher.CheckDebugProtocolOption())
+            {
+                SetupDebugTargetInfoForWebkitV2Protocol(ref vsDebugTargetInfo, debugLaunchContext, nodeExe);
+            }
+            else
+            {
+                this.SetupDebugTargetInfoForNodeProtocol(ref vsDebugTargetInfo, debugLaunchContext, nodeExe);
+            }
+        }
+
+        private void SetupDebugTargetInfoForNodeProtocol(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext, string nodeExe)
         {
             var target = vsDebugTargetInfo.bstrExe;
-            vsDebugTargetInfo.bstrExe = debugLaunchContext.LaunchConfiguration.GetValue<string>(NodeExeKey, Nodejs.GetPathToNodeExecutableFromEnvironment());
+            vsDebugTargetInfo.bstrExe = nodeExe;
             var nodeJsArgs = vsDebugTargetInfo.bstrArg;
             vsDebugTargetInfo.bstrArg = "\"" + target + "\"";
             if (!string.IsNullOrEmpty(nodeJsArgs))
@@ -58,6 +77,61 @@ public void SetupDebugTargetInfo(ref VsDebugTargetInfo vsDebugTargetInfo, DebugL
             vsDebugTargetInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;
         }
 
+        private void SetupDebugTargetInfoForWebkitV2Protocol(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext, string nodeExe)
+        {
+            // todo: refactor the debugging and process starting so we can re-use
+
+            var setupConfiguration = new SetupConfiguration();
+            var setupInstance = setupConfiguration.GetInstanceForCurrentProcess();
+            var visualStudioInstallationInstanceID = setupInstance.GetInstanceId();
+
+            // The Node2Adapter depends on features only in Node v6+, so the old v5.4 version of node will not suffice for this scenario
+            // This node.exe will be the one used by the node2 debug adapter, not the one used to host the user code.
+            var pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), "JavaScript\\Node.JS\\v6.4.0_x86\\Node.exe");
+
+            // We check the registry to see if any parameters for the node.exe invocation have been specified (like "--inspect"), and append them if we find them.
+            var nodeParams = NodejsProjectLauncher.CheckForRegistrySpecifiedNodeParams();
+            if (!string.IsNullOrEmpty(nodeParams))
+            {
+                pathToNodeExe = pathToNodeExe + " " + nodeParams;
+            }
+
+            var pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@"""%ALLUSERSPROFILE%\" +
+                    $@"Microsoft\VisualStudio\NodeAdapter\{visualStudioInstallationInstanceID}\extension\out\src\nodeDebug.js""");
+
+            string trimmedPathToNode2DebugAdapter = pathToNode2DebugAdapterRuntime.Replace("\"", "");
+            if (!File.Exists(trimmedPathToNode2DebugAdapter))
+            {
+                pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@"""%ALLUSERSPROFILE%\" +
+                    $@"Microsoft\VisualStudio\NodeAdapter\{visualStudioInstallationInstanceID}\out\src\nodeDebug.js""");
+            }
+
+            var target = vsDebugTargetInfo.bstrExe;
+            var cwd = Path.GetDirectoryName(target); // Current working directory
+
+            var configuration = new JObject(
+                new JProperty("name", "Debug Node.js program from Visual Studio"),
+                new JProperty("type", "node2"),
+                new JProperty("request", "launch"),
+                new JProperty("program", target),
+                new JProperty("runtimeExecutable", nodeExe),
+                new JProperty("cwd", cwd),
+                new JProperty("console", "externalTerminal"),
+                new JProperty("diagnosticLogging", NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption()),
+                new JProperty("sourceMaps", true),
+                new JProperty("stopOnEntry", true),
+                new JProperty("$adapter", pathToNodeExe),
+                new JProperty("$adapterArgs", pathToNode2DebugAdapterRuntime));
+
+            var jsonContent = configuration.ToString();
+
+            vsDebugTargetInfo.dlo = DEBUG_LAUNCH_OPERATION.DLO_CreateProcess;
+            vsDebugTargetInfo.clsidCustom = NodejsProjectLauncher.WebKitDebuggerV2Guid;
+            vsDebugTargetInfo.bstrExe = target;
+            vsDebugTargetInfo.bstrOptions = jsonContent;
+            vsDebugTargetInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;
+        }
+
         [ExportLaunchConfigurationProvider(LaunchConfigurationProviderType, new[] { ".js" }, "nodejs", NodeJsSchema)]
         public class LaunchConfigurationProvider : ILaunchConfigurationProvider
         {

Nodejs/Product/Nodejs/NodejsPackage.cs

@@ -54,10 +54,8 @@ namespace Microsoft.NodejsTools
     [ProvideProjectFactory(typeof(NodejsProjectFactory), null, null, null, null, ".\\NullPath", LanguageVsTemplate = NodejsConstants.Nodejs, SortPriority = 0x17)]   // outer flavor, no file extension
     [ProvideDebugPortSupplier("Node remote debugging", typeof(NodeRemoteDebugPortSupplier), NodeRemoteDebugPortSupplier.PortSupplierId)]
     [ProvideMenuResource("Menus.ctmenu", 1)]                              // This attribute is needed to let the shell know that this package exposes some menus.
-    [WebSiteProject("JavaScript", "JavaScript")]
     [ProvideLanguageTemplates("{349C5851-65DF-11DA-9384-00065B846F21}", NodejsConstants.JavaScript, Guids.NodejsPackageString, "Web", "Node.js Project Templates", "{" + Guids.NodejsBaseProjectFactoryString + "}", ".js", NodejsConstants.Nodejs, "{" + Guids.NodejsBaseProjectFactoryString + "}")]
     [ProvideProjectItem(typeof(BaseNodeProjectFactory), NodejsConstants.Nodejs, "FileTemplates\\NewItem", 0)]
-    [ProvideTextEditorAutomation(NodejsConstants.Nodejs, 106, 102, ProfileMigrationType.PassThrough)]
     [ProvideLanguageService(typeof(JadeLanguageInfo), JadeContentTypeDefinition.JadeLanguageName, 3041, RequestStockColors = true, ShowSmartIndent = false, ShowCompletion = false, DefaultToInsertSpaces = true, HideAdvancedMembersByDefault = false, EnableAdvancedMembersOption = false, ShowDropDownOptions = false)]
     [ProvideEditorExtension2(typeof(JadeEditorFactory), JadeContentTypeDefinition.JadeFileExtension, 50, __VSPHYSICALVIEWATTRIBUTES.PVA_SupportsPreview, "*:1", ProjectGuid = VSConstants.CLSID.MiscellaneousFilesProject_string, NameResourceID = 3041, EditorNameResourceId = 3045)]
     [ProvideEditorExtension2(typeof(JadeEditorFactory), JadeContentTypeDefinition.PugFileExtension, 50, __VSPHYSICALVIEWATTRIBUTES.PVA_SupportsPreview, "*:1", ProjectGuid = VSConstants.CLSID.MiscellaneousFilesProject_string, NameResourceID = 3041, EditorNameResourceId = 3045)]

Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs

@@ -41,7 +41,7 @@ public NpmWorker(INpmController controller)
 
         private void QueueCommand(QueuedNpmCommandInfo info)
         {
-            if (!this.commandQueue.IsAddingCompleted
+            if (this.commandQueue.IsAddingCompleted
                 || this.commandQueue.Contains(info)
                 || info.Equals(this.currentCommand))
             {
@@ -88,9 +88,9 @@ private void Run()
                 // The Take method will block the worker thread when there are no items left in the queue
                 // and the thread will be signalled when new items are items to the queue, or the queue is
                 // marked completed.
-                this.currentCommand = this.commandQueue.Take();
-                if (this.currentCommand != null)
+                if (this.commandQueue.TryTake(out var command, Timeout.Infinite) && command != null)
                 {
+                    this.currentCommand = command;
                     Execute(this.currentCommand);
                 }
             }

Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs

@@ -32,9 +32,9 @@ internal class NodejsProjectLauncher : IProjectLauncher
         private readonly NodejsProjectNode _project;
         private int? _testServerPort;
 
-        private static readonly Guid WebkitDebuggerGuid = Guid.Parse("4cc6df14-0ab5-4a91-8bb4-eb0bf233d0fe");
-        private static readonly Guid WebkitPortSupplierGuid = Guid.Parse("4103f338-2255-40c0-acf5-7380e2bea13d");
-        private static readonly Guid WebKitDebuggerV2Guid = Guid.Parse("30d423cc-6d0b-4713-b92d-6b2a374c3d89");
+        public static readonly Guid WebkitDebuggerGuid = Guid.Parse("4cc6df14-0ab5-4a91-8bb4-eb0bf233d0fe");
+        public static readonly Guid WebkitPortSupplierGuid = Guid.Parse("4103f338-2255-40c0-acf5-7380e2bea13d");
+        internal static readonly Guid WebKitDebuggerV2Guid = Guid.Parse("30d423cc-6d0b-4713-b92d-6b2a374c3d89");
 
         public NodejsProjectLauncher(NodejsProjectNode project)
         {
@@ -97,28 +97,28 @@ private int Start(string file, bool debug)
             return VSConstants.S_OK;
         }
 
-        private static bool CheckUseNewChromeDebugProtocolOption()
+        internal static bool CheckUseNewChromeDebugProtocolOption()
         {
             var optionString = NodejsDialogPage.LoadString(name: "WebKitVersion", cat: "Debugging");
 
             return !StringComparer.OrdinalIgnoreCase.Equals(optionString, "V1");
         }
 
-        private static bool CheckDebugProtocolOption()
+        internal static bool CheckDebugProtocolOption()
         {
             var optionString = NodejsDialogPage.LoadString(name: "DebugProtocol", cat: "Debugging");
 
             return StringComparer.OrdinalIgnoreCase.Equals(optionString, "chrome");
         }
 
-        private static bool CheckEnableDiagnosticLoggingOption()
+        internal static bool CheckEnableDiagnosticLoggingOption()
         {
             var optionString = NodejsDialogPage.LoadString(name: "DiagnosticLogging", cat: "Debugging");
 
             return StringComparer.OrdinalIgnoreCase.Equals(optionString, "true");
         }
 
-        private static string CheckForRegistrySpecifiedNodeParams()
+        internal static string CheckForRegistrySpecifiedNodeParams()
         {
             var paramString = NodejsDialogPage.LoadString(name: "NodeCmdParams", cat: "Debugging");
 
@@ -372,7 +372,7 @@ private void StartWithDebugger(string startupFile)
             }
         }
 
-        private void StartWithChromeV2Debugger(string program, string nodeRuntimeExecutable, bool startBrowser)
+        private void StartWithChromeV2Debugger(string file, string nodePath, bool startBrowser)
         {
             var serviceProvider = _project.Site;
 
@@ -412,8 +412,8 @@ private void StartWithChromeV2Debugger(string program, string nodeRuntimeExecuta
                 new JProperty("name", "Debug Node.js program from Visual Studio"),
                 new JProperty("type", "node2"),
                 new JProperty("request", "launch"),
-                new JProperty("program", program),
-                new JProperty("runtimeExecutable", nodeRuntimeExecutable),
+                new JProperty("program", file),
+                new JProperty("runtimeExecutable", nodePath),
                 new JProperty("cwd", cwd),
                 new JProperty("console", "externalTerminal"),
                 new JProperty("env", JObject.FromObject(envVars)),
@@ -429,7 +429,7 @@ private void StartWithChromeV2Debugger(string program, string nodeRuntimeExecuta
                 new VsDebugTargetInfo4() {
                     dlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_CreateProcess,
                     guidLaunchDebugEngine = WebKitDebuggerV2Guid,
-                    bstrExe = program,
+                    bstrExe = file,
                     bstrOptions = jsonContent
                 }
             };

Nodejs/Product/Nodejs/source.extension.vsixmanifest

@@ -30,9 +30,5 @@
     <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectWizard" Path="|ProjectWizard|" AssemblyName="|ProjectWizard;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" AssemblyName="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.VisualStudio.Shell.Interop.dll" AssemblyName="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.VisualStudio.Shell.Interop.8.0.dll" AssemblyName="Microsoft.VisualStudio.Shell.Interop.8.0" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="envdte.dll" AssemblyName="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   </Assets>
 </PackageManifest>