Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debugger: improve clearBreakpoint error and docs #175

Closed
wants to merge 1 commit into from
Closed

debugger: improve clearBreakpoint error and docs #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/api/debugger.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ prints the active watchers. To remove a watcher, type
functions body
* `setBreakpoint('script.js', 1)`, `sb(...)` - Set breakpoint on first line of
script.js
* `clearBreakpoint`, `cb(...)` - Clear breakpoint
* `clearBreakpoint('script.js', 1)`, `cb(...)` - Clear breakpoint in script.js
on line 1

It is also possible to set a breakpoint in a file (module) that
isn't loaded yet:
Expand Down
26 changes: 22 additions & 4 deletions lib/_debugger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,9 +1375,7 @@ Interface.prototype.setBreakpoint = function(script, line,
// setBreakpoint('scriptname')
if (script != +script && !this.client.scripts[script]) {
var scripts = this.client.scripts;
var keys = Object.keys(scripts);
for (var v = 0; v < keys.length; v++) {
var id = keys[v];
for (var id in scripts) {
if (scripts[id] &&
scripts[id].name &&
scripts[id].name.indexOf(script) !== -1) {
Expand Down Expand Up @@ -1452,6 +1450,7 @@ Interface.prototype.clearBreakpoint = function(script, line) {

var ambiguous,
breakpoint,
scriptId,
index;

this.client.breakpoints.some(function(bp, i) {
Expand All @@ -1461,6 +1460,7 @@ Interface.prototype.clearBreakpoint = function(script, line) {
if (!util.isUndefined(index)) {
ambiguous = true;
}
scriptId = script;
if (bp.line === line) {
index = i;
breakpoint = bp.id;
Expand All @@ -1469,10 +1469,28 @@ Interface.prototype.clearBreakpoint = function(script, line) {
}
});

if (!scriptId && !this.client.scripts[script]) {
var scripts = this.client.scripts;
for (var id in scripts) {
if (scripts[id] &&
scripts[id].name &&
scripts[id].name.indexOf(script) !== -1) {
if (scriptId) {
ambiguous = true;
}
scriptId = id;
}
}
}

if (ambiguous) return this.error('Script name is ambiguous');

if (util.isUndefined(scriptId)) {
return this.error('Script ' + script + ' not found');
}

if (util.isUndefined(breakpoint)) {
return this.error('Script : ' + script + ' not found');
return this.error('Breakpoint not found on line ' + line);
}

var self = this,
Expand Down