PR feedback

Author: Paul van Brenk

Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs

@@ -83,7 +83,15 @@ public NodeDebugger(Uri debuggerEndpointUri, int id)
             _attached = true;
         }
 
-        public NodeDebugger(string exe, string script, string dir, string env, string interpreterOptions, NodeDebugOptions debugOptions, ushort? debuggerPort = null, bool createNodeWindow = true)
+        public NodeDebugger(
+            string exe,
+            string script,
+            string dir,
+            string env,
+            string interpreterOptions,
+            NodeDebugOptions debugOptions,
+            ushort? debuggerPort = null,
+            bool createNodeWindow = true)
             : this() {
             // Select debugger port for a local connection
             var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();
@@ -105,7 +113,15 @@ private static ushort GetDebuggerPort() {
             return debuggerPortOrDefault;
         }
 
-        public static NodeProcess StartNodeProcessWithDebug(string exe, string script, string dir, string env, string interpreterOptions, NodeDebugOptions debugOptions, ushort? debuggerPort = null, bool createNodeWindow = true) {
+        public static NodeProcess StartNodeProcessWithDebug(
+            string exe, 
+            string script, 
+            string dir, 
+            string env, 
+            string interpreterOptions, 
+            NodeDebugOptions debugOptions,
+            ushort? debuggerPort = null, 
+            bool createNodeWindow = true) {
             // Select debugger port for a local connection
             var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();
 
@@ -115,7 +131,15 @@ public static NodeProcess StartNodeProcessWithDebug(string exe, string script, s
             return StartNodeProcess(exe, dir, env, debugOptions, debuggerPortOrDefault, allArgs, createNodeWindow);
         }
 
-        public static NodeProcess StartNodeProcessWithInspect(string exe, string script, string dir, string env, string interpreterOptions, NodeDebugOptions debugOptions, ushort? debuggerPort = null, bool createNodeWindow = true) {
+        public static NodeProcess StartNodeProcessWithInspect(
+            string exe, 
+            string script, 
+            string dir, 
+            string env, 
+            string interpreterOptions, 
+            NodeDebugOptions debugOptions, 
+            ushort? debuggerPort = null, 
+            bool createNodeWindow = true) {
             // Select debugger port for a local connection
             var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();
 
@@ -126,7 +150,15 @@ public static NodeProcess StartNodeProcessWithInspect(string exe, string script,
         }
 
         // starts the nodeprocess in debug mode without hooking up our debugger, this way we can attach the WebKit debugger as a next step.
-        private static NodeProcess StartNodeProcess(string exe, string dir, string env, NodeDebugOptions debugOptions, ushort debuggerPortOrDefault, string allArgs, bool createNodeWindow) {
+        private static NodeProcess StartNodeProcess(
+            string exe, 
+            string dir, 
+            string env, 
+            NodeDebugOptions 
+            debugOptions, 
+            ushort debuggerPortOrDefault, 
+            string allArgs, 
+            bool createNodeWindow) {
             var psi = new ProcessStartInfo(exe, allArgs) {
                 CreateNoWindow = !createNodeWindow,
                 WorkingDirectory = dir,

Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs

@@ -95,7 +95,8 @@ private void StartAndAttachDebugger(string file, string nodePath) {
 
             // start the node process
             var workingDir = _project.GetWorkingDirectory();
-            var env = "";
+            var url = GetFullUrl();
+            var env = GetEnvironmentVariablesString(url);
             var interpreterOptions = _project.GetProjectProperty(NodeProjectProperty.NodeExeArguments);
             var debugOptions = this.GetDebugOptions();
 
@@ -159,11 +160,11 @@ private static IntPtr MarshalDebugEngines(Guid[] debugEngines) {
                 return IntPtr.Zero;
             }
 
-            var guiSize = Marshal.SizeOf(typeof(Guid));
-            var size = debugEngines.Length * guiSize;
+            var guidSize = Marshal.SizeOf(typeof(Guid));
+            var size = debugEngines.Length * guidSize;
             var bytes = new byte[size];
             for (var i = 0; i < debugEngines.Length; ++i) {
-                debugEngines[i].ToByteArray().CopyTo(bytes, i * guiSize);
+                debugEngines[i].ToByteArray().CopyTo(bytes, i * guidSize);
             }
 
             var pDebugEngines = Marshal.AllocCoTaskMem(size);