debug: if no scope is found containg the range try to search across all scopes

isidorn · isidorn · commit 39677057ce2a · 2017-05-10T11:21:01.000+02:00
fixes microsoft#24277
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -341,8 +341,9 @@ export class StackFrame implements IStackFrame {
 				return scopes;
 			}
 
-			return [scopes.filter(scope => scope.range && Range.containsRange(scope.range, range))
-				.sort((first, second) => (first.range.endLineNumber - first.range.startLineNumber) - (second.range.endLineNumber - second.range.startLineNumber)).shift()];
+			const scopesContainingRange = scopes.filter(scope => scope.range && Range.containsRange(scope.range, range))
+				.sort((first, second) => (first.range.endLineNumber - first.range.startLineNumber) - (second.range.endLineNumber - second.range.startLineNumber));
+			return scopesContainingRange.length > 0 ? scopesContainingRange.slice(0, 1) : scopes;
 		});
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,9 @@ export class StackFrame implements IStackFrame {`
`341`	`341`	`return scopes;`
`342`	`342`	`}`
`343`	`343`
`344`		`- return [scopes.filter(scope => scope.range && Range.containsRange(scope.range, range))`
`345`		`- .sort((first, second) => (first.range.endLineNumber - first.range.startLineNumber) - (second.range.endLineNumber - second.range.startLineNumber)).shift()];`
	`344`	`+ const scopesContainingRange = scopes.filter(scope => scope.range && Range.containsRange(scope.range, range))`
	`345`	`+ .sort((first, second) => (first.range.endLineNumber - first.range.startLineNumber) - (second.range.endLineNumber - second.range.startLineNumber));`
	`346`	`+ return scopesContainingRange.length > 0 ? scopesContainingRange.slice(0, 1) : scopes;`
`346`	`347`	`});`
`347`	`348`	`}`
`348`	`349`