fix: Breakpoints & scripts work when not paused

nodejs · Oct 20, 2016 · 6f9883d · 6f9883d
1 parent 1223b3b
commit 6f9883d
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/internal/inspect-repl.js b/lib/internal/inspect-repl.js
@@ -274,7 +274,7 @@ function createRepl(inspector) {
   }
 
   function isCurrentScript(script) {
-    return getCurrentLocation().scriptId === script.scriptId;
+    return selectedFrame && getCurrentLocation().scriptId === script.scriptId;
   }
 
   function formatScripts(displayNatives = false) {
@@ -354,6 +354,12 @@ function createRepl(inspector) {
     }
   }
 
+  function getSourceSnippet(location, delta = 5) {
+    const { scriptId } = location;
+    return Debugger.getScriptSource({ scriptId })
+      .then(({ scriptSource }) => new SourceSnippet(location, delta, scriptSource));
+  }
+
   class CallFrame {
     constructor(callFrame) {
       Object.assign(this, callFrame);
@@ -374,9 +380,7 @@ function createRepl(inspector) {
     }
 
     list(delta = 5) {
-      const { scriptId } = this.location;
-      return Debugger.getScriptSource({ scriptId })
-        .then(({ scriptSource }) => new SourceSnippet(this.location, delta, scriptSource));
+      return getSourceSnippet(this.location, delta);
     }
   }
 
@@ -557,7 +561,7 @@ function createRepl(inspector) {
     function registerBreakpoint({ breakpointId, actualLocation }) {
       handleBreakpointResolved({ breakpointId, location: actualLocation });
       if (actualLocation && actualLocation.scriptId) {
-        if (!silent) return list(5);
+        if (!silent) return getSourceSnippet(actualLocation, 5);
       } else {
         print(`Warning: script '${script}' was not loaded yet.`);
       }