Finish up options to use when starting the Node process

Author: Paul van Brenk

Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs

@@ -85,11 +85,6 @@ public sealed class AD7Engine : IDebugEngine2, IDebugEngineLaunch2, IDebugProgra
         /// </summary>
         public const string WaitOnNormalExitSetting = "WAIT_ON_NORMAL_EXIT";
 
-        /// <summary>
-        /// Specifies if the output should be redirected to the visual studio output window.
-        /// </summary>
-        public const string RedirectOutputSetting = "REDIRECT_OUTPUT";
-
         /// <summary>
         /// Specifies options which should be passed to the Node runtime before the script.  If
         /// the interpreter options should include a semicolon then it should be escaped as a double
@@ -517,11 +512,6 @@ int IDebugEngineLaunch2.LaunchSuspended(string pszServer, IDebugPort2 port, stri
                                     debugOptions |= NodeDebugOptions.WaitOnNormalExit;
                                 }
                                 break;
-                            case RedirectOutputSetting:
-                                if (Boolean.TryParse(setting[1], out value) && value) {
-                                    debugOptions |= NodeDebugOptions.RedirectOutput;
-                                }
-                                break;
                             case DirMappingSetting:
                                 string[] dirs = setting[1].Split('|');
                                 if (dirs.Length == 2) {

Nodejs/Product/Nodejs/Debugger/NodeDebugOptions.cs

@@ -29,15 +29,5 @@ internal enum NodeDebugOptions {
         /// Passing this flag to the debugger will cause it to wait for input on a normal (zero) exit code.
         /// </summary>
         WaitOnNormalExit = 0x02,
-        /// <summary>
-        /// Passing this flag will cause output to standard out to be redirected via the debugger
-        /// so it can be outputted in the Visual Studio debug output window.
-        /// </summary>
-        RedirectOutput = 0x04,
-
-        /// <summary>
-        /// Set if you do not want to create a window
-        /// </summary>
-        CreateNoWindow = 0x40
     }
 }

Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs

@@ -151,8 +151,6 @@ private static NodeProcess StartNodeProcess(string exe, string dir, string env,
                 debuggerPort: debuggerPortOrDefault);
         }
 
-
-
         #region Public Process API
 
         public int Id => _id != null ? _id.Value : _process.Id;
@@ -244,7 +242,7 @@ public async Task BreakAllAsync() {
             // We need to get the backtrace before we break, so we request the backtrace
             // and follow up with firing the appropriate event for the break
             tokenSource = new CancellationTokenSource(_timeout);
-            bool running = await PerformBacktraceAsync(tokenSource.Token).ConfigureAwait(false);
+            var running = await PerformBacktraceAsync(tokenSource.Token).ConfigureAwait(false);
             Debug.Assert(!running);
 
             // Fallback to firing step complete event

Nodejs/Product/Nodejs/Logging/LiveLogger.cs

@@ -14,11 +14,11 @@
 //
 //*********************************************************//
 
-using Microsoft.NodejsTools.Options;
-using Microsoft.VisualStudioTools.Project;
 using System;
 using System.Diagnostics;
 using System.Globalization;
+using Microsoft.NodejsTools.Options;
+using Microsoft.VisualStudioTools.Project;
 
 namespace Microsoft.NodejsTools.Logging {
 

Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs

@@ -94,19 +94,20 @@ private int Start(string file, bool debug) {
         private void StartAndAttachDebugger(string file, string nodePath) {
 
             // start the node process
-            string workingDir = _project.GetWorkingDirectory();
-            string env = "";
+            var workingDir = _project.GetWorkingDirectory();
+            var env = "";
             var interpreterOptions = _project.GetProjectProperty(NodeProjectProperty.NodeExeArguments);
+            var debugOptions = this.GetDebugOptions();
 
-            var process = NodeDebugger.StartNodeProcessWithInspect(exe: nodePath, script: file, dir: workingDir, env: env, interpreterOptions: interpreterOptions, debugOptions: NodeDebugOptions.None);
+            var process = NodeDebugger.StartNodeProcessWithInspect(exe: nodePath, script: file, dir: workingDir, env: env, interpreterOptions: interpreterOptions, debugOptions: debugOptions);
             process.Start();
 
             // setup debug info and attach
             var debugUri = $"http://127.0.0.1:{process.DebuggerPort}";
 
             var dbgInfo = new VsDebugTargetInfo4();
             dbgInfo.dlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_AlreadyRunning;
-            dbgInfo.LaunchFlags = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_DetachOnStop;
+            dbgInfo.LaunchFlags = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;
 
             dbgInfo.guidLaunchDebugEngine = WebkitDebuggerGuid;
             dbgInfo.dwDebugEngineCount = 1;
@@ -115,6 +116,7 @@ private void StartAndAttachDebugger(string file, string nodePath) {
             dbgInfo.pDebugEngines = enginesPtr;
             dbgInfo.guidPortSupplier = WebkitPortSupplierGuid;
             dbgInfo.bstrPortName = debugUri;
+            dbgInfo.fSendToOutputWindow = 0;
 
             // we connect through a URI, so no need to set the process,
             // we need to set the process id to '1' so the debugger is able to attach
@@ -123,6 +125,22 @@ private void StartAndAttachDebugger(string file, string nodePath) {
             AttachDebugger(dbgInfo);
         }
 
+        private NodeDebugOptions GetDebugOptions() {
+
+            var debugOptions = NodeDebugOptions.None;
+
+            if (NodejsPackage.Instance.GeneralOptionsPage.WaitOnAbnormalExit) {
+                debugOptions |= NodeDebugOptions.WaitOnAbnormalExit;
+            }
+
+            if (NodejsPackage.Instance.GeneralOptionsPage.WaitOnNormalExit) {
+                debugOptions |= NodeDebugOptions.WaitOnNormalExit;
+            }
+
+
+            return debugOptions;
+        }
+
         private void AttachDebugger(VsDebugTargetInfo4 dbgInfo) {
             var serviceProvider = _project.Site;
 
@@ -155,7 +173,7 @@ private static IntPtr MarshalDebugEngines(Guid[] debugEngines) {
         }
 
         private void StartNodeProcess(string file, string nodePath, bool startBrowser) {
-            //TODO: looks like this duplicates a ton of code in NodeDebugger
+            //TODO: looks like this duplicates a bunch of code in NodeDebugger
             var psi = new ProcessStartInfo() {
                 UseShellExecute = false,
 
@@ -228,7 +246,7 @@ private string GetFullUrl() {
             }
         }
 
-        internal static string GetFullUrl(string host, int port) {
+        private static string GetFullUrl(string host, int port) {
             UriBuilder builder;
             Uri uri;
             if (Uri.TryCreate(host, UriKind.Absolute, out uri)) {
@@ -332,10 +350,19 @@ private bool SetupDebugInfo(ref VsDebugTargetInfo dbgInfo, string startupFile) {
             }
 
             dbgInfo.fSendStdoutToOutputWindow = 0;
+            dbgInfo.bstrEnv = GetEnvironmentVariablesString(url);
 
+
+            // Set the Node  debugger
+            dbgInfo.clsidCustom = AD7Engine.DebugEngineGuid;
+            dbgInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;
+            return true;
+        }
+
+        private string GetEnvironmentVariablesString(string url) {
             var env = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             if (!String.IsNullOrWhiteSpace(url)) {
-                Uri webUrl = new Uri(url);
+                var webUrl = new Uri(url);
                 env["PORT"] = webUrl.Port.ToString();
             }
 
@@ -347,7 +374,7 @@ private bool SetupDebugInfo(ref VsDebugTargetInfo dbgInfo, string startupFile) {
                 // add any inherited env vars
                 var variables = Environment.GetEnvironmentVariables();
                 foreach (var key in variables.Keys) {
-                    string strKey = (string)key;
+                    var strKey = (string)key;
                     if (!env.ContainsKey(strKey)) {
                         env.Add(strKey, (string)variables[key]);
                     }
@@ -356,18 +383,15 @@ private bool SetupDebugInfo(ref VsDebugTargetInfo dbgInfo, string startupFile) {
                 //Environment variables should be passed as a
                 //null-terminated block of null-terminated strings. 
                 //Each string is in the following form:name=value\0
-                StringBuilder buf = new StringBuilder();
+                var buf = new StringBuilder();
                 foreach (var entry in env) {
                     buf.AppendFormat("{0}={1}\0", entry.Key, entry.Value);
                 }
                 buf.Append("\0");
-                dbgInfo.bstrEnv = buf.ToString();
+                return buf.ToString();
             }
 
-            // Set the Node  debugger
-            dbgInfo.clsidCustom = AD7Engine.DebugEngineGuid;
-            dbgInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;
-            return true;
+            return null;
         }
 
         private bool ShouldStartBrowser() {