debug: sources should be a map of uri string to source

fixes broken internal module fetching
microsoft · Mar 8, 2017 · 37d2953 · 37d2953
1 parent 718b163
commit 37d2953
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -45,7 +45,7 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 		if (!process) {
 			return TPromise.wrapError(localize('unable', "Unable to resolve the resource without a debug session"));
 		}
-		const source = process.sources.get(resource);
+		const source = process.sources.get(resource.toString());
 		const rawSource = source ? source.raw : { path: paths.normalize(resource.fsPath, true) };
 
 		return process.session.source({ sourceReference: source ? source.reference : undefined, source: rawSource }).then(response => {

diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
@@ -102,7 +102,7 @@ export interface IProcess extends ITreeElement {
 	name: string;
 	configuration: IConfig;
 	session: ISession;
-	sources: Map<uri, Source>;
+	sources: Map<string, Source>;
 	isAttach(): boolean;
 	getThread(threadId: number): IThread;
 	getAllThreads(): IThread[];

diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -449,7 +449,7 @@ export class Thread implements debug.IThread {
 					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, source);
+				this.process.sources.set(source.uri.toString(), source);
 
 				return new StackFrame(this, rsf.id, source, rsf.name, rsf.line, rsf.column);
 			});
@@ -494,11 +494,11 @@ export class Thread implements debug.IThread {
 export class Process implements debug.IProcess {
 
 	private threads: Map<number, Thread>;
-	public sources: Map<uri, Source>;
+	public sources: Map<string, Source>;
 
 	constructor(public configuration: debug.IConfig, private _session: debug.ISession & debug.ITreeElement) {
 		this.threads = new Map<number, Thread>();
-		this.sources = new Map<uri, Source>();
+		this.sources = new Map<string, Source>();
 	}
 
 	public get session(): debug.ISession {

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -945,7 +945,7 @@ export class DebugService implements debug.IDebugService {
 			const breakpointsToSend = distinct(this.model.getBreakpoints().filter(bp => this.model.areBreakpointsActivated() && bp.enabled && bp.uri.toString() === modelUri.toString()),
 				bp => bp.lineNumber.toString());
 
-			const source = process.sources.get(modelUri);
+			const source = process.sources.get(modelUri.toString());
 			const rawSource = source ? source.raw : { path: paths.normalize(modelUri.fsPath, true) };
 
 			return session.setBreakpoints({