Merge branch 'master' into rkeithhill/is149-scriptpath-spaces

rkeithhill · rkeithhill · commit 575705830332 · 2016-02-10T19:13:48.000-07:00
diff --git a/src/PowerShellEditorServices.Host/Program.cs b/src/PowerShellEditorServices.Host/Program.cs
@@ -27,15 +27,15 @@ static void Main(string[] args)
                             "/waitForDebugger",
                             StringComparison.InvariantCultureIgnoreCase));
 
-            // Should we wait for the debugger before starting?
             if (waitForDebugger)
             {
-                // Wait for 25 seconds and then continue
-                int waitCountdown = 25;
-                while (!Debugger.IsAttached && waitCountdown > 0)
+                if (Debugger.IsAttached)
                 {
-                    Thread.Sleep(1000);
-                    waitCountdown--;
+                    Debugger.Break();
+                }
+                else
+                {
+                    Debugger.Launch();
                 }
             }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ static void Main(string[] args)`
`27`	`27`	`"/waitForDebugger",`
`28`	`28`	`StringComparison.InvariantCultureIgnoreCase));`
`29`	`29`
`30`		`- // Should we wait for the debugger before starting?`
`31`	`30`	`if (waitForDebugger)`
`32`	`31`	`{`
`33`		`- // Wait for 25 seconds and then continue`
`34`		`- int waitCountdown = 25;`
`35`		`- while (!Debugger.IsAttached && waitCountdown > 0)`
	`32`	`+ if (Debugger.IsAttached)`
`36`	`33`	`{`
`37`		`- Thread.Sleep(1000);`
`38`		`- waitCountdown--;`
	`34`	`+ Debugger.Break();`
	`35`	`+ }`
	`36`	`+ else`
	`37`	`+ {`
	`38`	`+ Debugger.Launch();`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`#endif`