fallback get-psbreakpoint

PowerShell · Jan 29, 2020 · 23304a2 · 23304a2
1 parent 4d33882
commit 23304a2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/BreakpointService.cs b/src/PowerShellEditorServices/Services/DebugAdapter/BreakpointService.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
@@ -41,11 +42,20 @@ internal class BreakpointService
             _debugStateService = debugStateService;
         }
 
-        public List<Breakpoint> GetBreakpoints()
+        public async Task<List<Breakpoint>> GetBreakpointsAsync()
         {
-            return BreakpointApiUtils.GetBreakpoints(
-                _powerShellContextService.CurrentRunspace.Runspace.Debugger,
-                _debugStateService.RunspaceId);
+            if (VersionUtils.IsPS7OrGreater)
+            {
+                return BreakpointApiUtils.GetBreakpoints(
+                    _powerShellContextService.CurrentRunspace.Runspace.Debugger,
+                    _debugStateService.RunspaceId);
+            }
+
+            // Legacy behavior
+            PSCommand psCommand = new PSCommand();
+            psCommand.AddCommand(@"Microsoft.PowerShell.Utility\Get-PSBreakpoint");
+            IEnumerable<Breakpoint> breakpoints = await _powerShellContextService.ExecuteCommandAsync<Breakpoint>(psCommand);
+            return breakpoints.ToList();
         }
 
         public async Task<IEnumerable<BreakpointDetails>> SetBreakpointsAsync(string escapedScriptPath, IEnumerable<BreakpointDetails> breakpoints)
@@ -238,9 +248,15 @@ public async Task RemoveAllBreakpointsAsync(string scriptPath = null)
 
                 PSCommand psCommand = new PSCommand();
                 psCommand.AddCommand(@"Microsoft.PowerShell.Utility\Get-PSBreakpoint");
+
+                if (!string.IsNullOrEmpty(scriptPath))
+                {
+                    psCommand.AddParameter("Script", scriptPath);
+                }
+
                 psCommand.AddCommand(@"Microsoft.PowerShell.Utility\Remove-PSBreakpoint");
 
-                await _powerShellContextService.ExecuteCommandAsync<object>(psCommand);
+                await _powerShellContextService.ExecuteCommandAsync<object>(psCommand).ConfigureAwait(false);
             }
             catch (Exception e)
             {

diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs b/src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs
@@ -212,7 +212,7 @@ internal class DebugService
             if (clearExisting)
             {
                 // Flatten dictionary values into one list and remove them all.
-                await _breakpointService.RemoveBreakpointsAsync(_breakpointService.GetBreakpoints().Where( i => i is CommandBreakpoint)).ConfigureAwait(false);
+                await _breakpointService.RemoveBreakpointsAsync((await _breakpointService.GetBreakpointsAsync()).Where( i => i is CommandBreakpoint)).ConfigureAwait(false);
             }
 
             if (breakpoints.Length > 0)
@@ -672,8 +672,9 @@ private async Task ClearBreakpointsInFileAsync(ScriptFile scriptFile)
             // {
                 // if (breakpoints.Count > 0)
                 // {
-                    await _breakpointService.RemoveBreakpointsAsync(_breakpointService.GetBreakpoints()
-                        .Where(bp => bp is LineBreakpoint lbp && string.Equals(lbp.Script, scriptFile.FilePath))).ConfigureAwait(false);
+                    await _breakpointService.RemoveAllBreakpointsAsync(scriptFile.FilePath).ConfigureAwait(false);
+                    // await _breakpointService.RemoveBreakpointsAsync((await _breakpointService.GetBreakpointsAsync())
+                    //     .Where(bp => bp is LineBreakpoint lbp && string.Equals(lbp.Script, scriptFile.FilePath))).ConfigureAwait(false);
 
                     // Clear the existing breakpoints list for the file
                     // breakpoints.Clear();