Merge pull request #425 from PowerShell/rkeithhill/debugger-break

daviwil · web-flow · commit 06fba727f0f3 · 2017-04-07T06:26:01.000-07:00
How about popping UI to attach the debugger?
diff --git a/src/PowerShellEditorServices.Host/EditorServicesHost.cs b/src/PowerShellEditorServices.Host/EditorServicesHost.cs
@@ -73,14 +73,16 @@ public EditorServicesHost(
             this.featureFlags = new HashSet<string>(featureFlags ?? new string[0]);
 
 #if DEBUG
-            int waitsRemaining = 10;
             if (waitForDebugger)
             {
-                while (waitsRemaining > 0 && !Debugger.IsAttached)
+                if (Debugger.IsAttached)
                 {
-                    Thread.Sleep(1000);
-                    waitsRemaining--;
+                    Debugger.Break();
                 }
+                else
+                {
+                    Debugger.Launch();
+                }                
             }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -73,14 +73,16 @@ public EditorServicesHost(`
`73`	`73`	`this.featureFlags = new HashSet<string>(featureFlags ?? new string[0]);`
`74`	`74`
`75`	`75`	`#if DEBUG`
`76`		`- int waitsRemaining = 10;`
`77`	`76`	`if (waitForDebugger)`
`78`	`77`	`{`
`79`		`- while (waitsRemaining > 0 && !Debugger.IsAttached)`
	`78`	`+ if (Debugger.IsAttached)`
`80`	`79`	`{`
`81`		`- Thread.Sleep(1000);`
`82`		`- waitsRemaining--;`
	`80`	`+ Debugger.Break();`
`83`	`81`	`}`
	`82`	`+ else`
	`83`	`+ {`
	`84`	`+ Debugger.Launch();`
	`85`	`+ }`
`84`	`86`	`}`
`85`	`87`	`#endif`
`86`	`88`