Use original scheme (fixes #29872)

microsoft · Jun 29, 2017 · 8da3ea9 · 8da3ea9
1 parent 605ee59
commit 8da3ea9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts
@@ -88,14 +88,15 @@ export default class CommandHandler implements vscode.Disposable {
 			}
 		}
 
+		const scheme = editor.document.uri.scheme;
 		let range = conflict.current.content;
 		const leftUri = editor.document.uri.with({
 			scheme: ContentProvider.scheme,
-			query: JSON.stringify(range)
+			query: JSON.stringify({ scheme, range })
 		});
 
 		range = conflict.incoming.content;
-		const rightUri = leftUri.with({ query: JSON.stringify(range) });
+		const rightUri = leftUri.with({ query: JSON.stringify({ scheme, range }) });
 
 		const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName);
 		vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);

diff --git a/extensions/merge-conflict/src/contentProvider.ts b/extensions/merge-conflict/src/contentProvider.ts
@@ -24,9 +24,10 @@ export default class MergeConflictContentProvider implements vscode.TextDocument
 
 	async provideTextDocumentContent(uri: vscode.Uri): Promise<string | null> {
 		try {
-			const [start, end] = JSON.parse(uri.query) as { line: number, character: number }[];
+			const { scheme, range } = JSON.parse(uri.query) as { scheme: string; range: { line: number, character: number }[] };
+			const [start, end] = range;
 
-			const document = await vscode.workspace.openTextDocument(uri.with({ scheme: 'file', query: '' }));
+			const document = await vscode.workspace.openTextDocument(uri.with({ scheme, query: '' }));
 			const text = document.getText(new vscode.Range(start.line, start.character, end.line, end.character));
 			return text;
 		}