microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-07 17:44:05 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

debug: open deemphesize sources. Also keep track of the same instance of a source object in the map

Browse Source 
fixes #21941
This commit is contained in:
isidor
2017-03-08 16:24:05 +01:00
parent 64a63c1c4d
commit 4d3cfdc472
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/parts/debug/common/debugModel.ts
View File

@@ -367,7 +367,7 @@ export class StackFrame implements debug.IStackFrame {
}
public openInEditor(editorService: IWorkbenchEditorService, preserveFocus?: boolean, sideBySide?: boolean): TPromise<any> {
return this.source.deemphasize ? TPromise.as(true) : editorService.openEditor({
return editorService.openEditor({
resource: this.source.uri,
description: this.source.origin,
options: {
@@ -448,8 +448,12 @@ export class Thread implements debug.IThread {
if (!rsf) {
return new StackFrame(this, 0, new Source({ name: UNKNOWN_SOURCE_LABEL }, true), nls.localize('unknownStack', "Unknown stack location"), null, null);
}
const source = rsf.source ? new Source(rsf.source, rsf.source.presentationHint === 'deemphasize') : new Source({ name: UNKNOWN_SOURCE_LABEL }, true);
this.process.sources.set(source.uri.toString(), source);
let source = rsf.source ? new Source(rsf.source, rsf.source.presentationHint === 'deemphasize') : new Source({ name: UNKNOWN_SOURCE_LABEL }, true);
if (this.process.sources.has(source.uri.toString())) {
source = this.process.sources.get(source.uri.toString());
} else {
this.process.sources.set(source.uri.toString(), source);
}
return new StackFrame(this, rsf.id, source, rsf.name, rsf.line, rsf.column);
});

6
src/vs/workbench/parts/debug/common/debugSource.ts
View File

@@ -28,10 +28,6 @@ export class Source {
}
public get inMemory() {
return Source.isInMemory(this.uri);
}
public static isInMemory(uri: uri): boolean {
return uri.toString().indexOf(`${DEBUG_SCHEME}:`) === 0;
return this.uri.toString().indexOf(`${DEBUG_SCHEME}:`) === 0;
}
}