Fix path resolving

Author: alexr00

src/common/uri.ts

@@ -172,6 +172,18 @@ export function toPRUri(
 	});
 }
 
+export enum Schemas {
+	file = 'file'
+}
+
+export function resolvePath(from: Uri, to: string) {
+	if (from.scheme === Schemas.file) {
+		return pathUtils.resolve(from.fsPath, to);
+	} else {
+		return pathUtils.posix.resolve(from.path, to);
+	}
+}
+
 class UriEventHandler extends EventEmitter<Uri> implements UriHandler {
 	public handleUri(uri: Uri) {
 		this.fire(uri);

src/github/pullRequestModel.ts

@@ -14,7 +14,7 @@ import Logger from '../common/logger';
 import { Remote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
 import { ReviewEvent as CommonReviewEvent, isReviewEvent, TimelineEvent } from '../common/timelineEvent';
-import { toPRUri, toReviewUri } from '../common/uri';
+import { resolvePath, toPRUri, toReviewUri } from '../common/uri';
 import { formatError } from '../common/utils';
 import { OctokitCommon } from './common';
 import { FolderRepositoryManager } from './folderRepositoryManager';
@@ -992,7 +992,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			const headCommit = pullRequestModel.head!.sha;
 			const parentFileName = change.status === GitChangeType.RENAME ? change.previousFileName! : change.fileName;
 			headUri = toPRUri(
-				vscode.Uri.file(path.resolve(folderManager.repository.rootUri.fsPath, change.fileName)),
+				vscode.Uri.file(resolvePath(folderManager.repository.rootUri, change.fileName)),
 				pullRequestModel,
 				change.baseCommit,
 				headCommit,
@@ -1001,7 +1001,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 				change.status,
 			);
 			baseUri = toPRUri(
-				vscode.Uri.file(path.resolve(folderManager.repository.rootUri.fsPath, parentFileName)),
+				vscode.Uri.file(resolvePath(folderManager.repository.rootUri, parentFileName)),
 				pullRequestModel,
 				change.baseCommit,
 				headCommit,

src/view/treeNodes/pullRequestNode.ts

@@ -3,13 +3,12 @@
  *  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 { getCommentingRanges } from '../../common/commentingRanges';
 import { DiffChangeType, getModifiedContentFromDiffHunk, parseDiff } from '../../common/diffHunk';
 import { GitChangeType, SlimFileChange } from '../../common/file';
 import Logger from '../../common/logger';
-import { fromPRUri, toPRUri } from '../../common/uri';
+import { fromPRUri, resolvePath, toPRUri } from '../../common/uri';
 import { FolderRepositoryManager } from '../../github/folderRepositoryManager';
 import { PullRequestModel } from '../../github/pullRequestModel';
 import { getInMemPRContentProvider } from '../inMemPRContentProvider';
@@ -182,7 +181,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider {
 					change.blobUrl,
 					toPRUri(
 						vscode.Uri.file(
-							path.resolve(this._folderReposManager.repository.rootUri.fsPath, change.fileName),
+							resolvePath(this._folderReposManager.repository.rootUri, change.fileName),
 						),
 						this.pullRequestModel,
 						change.baseCommit,
@@ -193,7 +192,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider {
 					),
 					toPRUri(
 						vscode.Uri.file(
-							path.resolve(this._folderReposManager.repository.rootUri.fsPath, parentFileName),
+							resolvePath(this._folderReposManager.repository.rootUri, parentFileName),
 						),
 						this.pullRequestModel,
 						change.baseCommit,
@@ -205,6 +204,8 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider {
 				);
 			}
 
+			console.log(vscode.Uri.file(resolvePath(this._folderReposManager.repository.rootUri, change.fileName)));
+
 			const changedItem = new InMemFileChangeNode(
 				this._folderReposManager,
 				this,
@@ -214,7 +215,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider {
 				change.previousFileName,
 				change.blobUrl,
 				toPRUri(
-					vscode.Uri.file(path.resolve(this._folderReposManager.repository.rootUri.fsPath, change.fileName)),
+					vscode.Uri.file(resolvePath(this._folderReposManager.repository.rootUri, change.fileName)),
 					this.pullRequestModel,
 					change.baseCommit,
 					headCommit,
@@ -223,7 +224,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider {
 					change.status,
 				),
 				toPRUri(
-					vscode.Uri.file(path.resolve(this._folderReposManager.repository.rootUri.fsPath, parentFileName)),
+					vscode.Uri.file(resolvePath(this._folderReposManager.repository.rootUri, parentFileName)),
 					this.pullRequestModel,
 					change.baseCommit,
 					headCommit,