Use the correct path

Author: alexr00

src/common/uri.ts

@@ -323,6 +323,13 @@ export namespace DataUri {
 	}
 }
 
+/**
+ * @param fileName The repo relative path to the file
+ */
+export function reviewPath(fileName: string, commitSha: string) {
+	return vscode.Uri.parse(pathUtils.posix.join(`commit~${commitSha.substr(0, 8)}`, fileName));
+}
+
 export function toReviewUri(
 	uri: vscode.Uri,
 	filePath: string | undefined,

src/github/pullRequestModel.ts

@@ -17,7 +17,7 @@ import Logger from '../common/logger';
 import { Remote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
 import { ClosedEvent, EventType, ReviewEvent } from '../common/timelineEvent';
-import { resolvePath, Schemes, toPRUri, toReviewUri } from '../common/uri';
+import { resolvePath, reviewPath, Schemes, toPRUri, toReviewUri } from '../common/uri';
 import { formatError, isDescendant } from '../common/utils';
 import { InMemFileChangeModel, RemoteFileChangeModel } from '../view/fileChangeModel';
 import { OctokitCommon } from './common';
@@ -1217,28 +1217,22 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			// Create URI pairs for the multi diff editor using review scheme
 			const args: [vscode.Uri, vscode.Uri | undefined, vscode.Uri | undefined][] = [];
 			for (const change of changes) {
-				const uri = vscode.Uri.file(path.resolve(repository.rootUri.fsPath, change.uri.fsPath));
-				const fileName = change.uri.fsPath;
+				const rightRelativePath = path.relative(repository.rootUri.fsPath, change.uri.fsPath);
+				const rightPath = reviewPath(rightRelativePath, commitSha);
+				let rightUri = toReviewUri(rightPath, rightRelativePath, undefined, commitSha, false, { base: false }, repository.rootUri);
+
+				const leftRelativePath = path.relative(repository.rootUri.fsPath, change.originalUri.fsPath);
+				const leftPath = reviewPath(leftRelativePath, parentSha);
+				let leftUri = toReviewUri(leftPath, (change.status === GitChangeType.RENAME) ? path.relative(repository.rootUri.fsPath, change.originalUri.fsPath) : leftRelativePath, undefined, parentSha, false, { base: true }, repository.rootUri);
 
 				if (change.status === GitChangeType.ADD) {
 					// For added files, show against empty
-					const headUri = toReviewUri(uri, fileName, undefined, commitSha, false, { base: false }, repository.rootUri);
-					args.push([headUri, undefined, headUri]);
+					args.push([rightUri, undefined, rightUri]);
 				} else if (change.status === GitChangeType.DELETE) {
 					// For deleted files, show old version against empty
-					const baseUri = toReviewUri(uri, fileName, undefined, parentSha, false, { base: true }, repository.rootUri);
-					args.push([uri, baseUri, undefined]);
-				} else if (change.status === GitChangeType.RENAME) {
-					// For renamed files, show old name against new name
-					const baseFileName = change.originalUri.fsPath;
-					const baseUri = toReviewUri(uri, baseFileName, undefined, parentSha, false, { base: true }, repository.rootUri);
-					const headUri = toReviewUri(uri, fileName, undefined, commitSha, false, { base: false }, repository.rootUri);
-					args.push([headUri, baseUri, headUri]);
+					args.push([rightPath, leftUri, undefined]);
 				} else {
-					// For modified files, show before and after
-					const baseUri = toReviewUri(uri, fileName, undefined, parentSha, false, { base: true }, repository.rootUri);
-					const headUri = toReviewUri(uri, fileName, undefined, commitSha, false, { base: false }, repository.rootUri);
-					args.push([headUri, baseUri, headUri]);
+					args.push([rightUri, leftUri, rightUri]);
 				}
 			}
 

src/view/treeNodes/commitNode.ts

@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
 import * as vscode from 'vscode';
 import { getGitChangeType } from '../../common/diffHunk';
 import { FILE_LIST_LAYOUT, PR_SETTINGS_NAMESPACE } from '../../common/settingKeys';
-import { DataUri, toReviewUri } from '../../common/uri';
+import { DataUri, reviewPath, toReviewUri } from '../../common/uri';
 import { dateFromNow } from '../../common/utils';
 import { OctokitCommon } from '../../github/common';
 import { FolderRepositoryManager } from '../../github/folderRepositoryManager';
@@ -58,7 +57,7 @@ export class CommitNode extends TreeNode implements vscode.TreeItem {
 
 		const fileChangeNodes = fileChanges.map(change => {
 			const fileName = change.filename!;
-			const uri = vscode.Uri.parse(path.posix.join(`commit~${this.commit.sha.substr(0, 8)}`, fileName));
+			const uri = reviewPath(fileName, this.commit.sha);
 			const changeModel = new GitFileChangeModel(
 				this.pullRequestManager,
 				this.pullRequest,