Extracts working uri helper

Author: eamodio

src/git/gitUri.ts

@@ -332,6 +332,6 @@ export class GitUri extends (Uri as any as UriEx) {
 
 export const unknownGitUri = Object.freeze(new GitUri());
 
-export function isGitUri(uri: any): uri is GitUri {
+export function isGitUri(uri: unknown): uri is GitUri {
 	return uri instanceof GitUri;
 }

src/git/gitUri.utils.ts

@@ -0,0 +1,18 @@
+import type { Uri } from 'vscode';
+import type { Container } from '../container';
+import { GitUri, isGitUri } from './gitUri';
+
+export async function ensureWorkingUri(container: Container, uri: Uri | undefined): Promise<Uri | undefined> {
+	if (uri == null) return undefined;
+
+	const gitUri = !isGitUri(uri) ? await GitUri.fromUri(uri) : uri;
+	if (gitUri.sha != null) {
+		// If we have a sha, normalize the history to the working file (so we get a full history all the time)
+		const workingUri = await container.git.getWorkingUri(gitUri.repoPath!, gitUri);
+		if (workingUri != null) {
+			uri = workingUri;
+		}
+	}
+
+	return uri;
+}

src/views/nodes/fileHistoryTrackerNode.ts

@@ -2,6 +2,7 @@ import type { TextEditor } from 'vscode';
 import { Disposable, TreeItem, TreeItemCollapsibleState, window } from 'vscode';
 import type { GitCommitish } from '../../git/gitUri';
 import { GitUri, unknownGitUri } from '../../git/gitUri';
+import { ensureWorkingUri } from '../../git/gitUri.utils';
 import { isBranchReference } from '../../git/utils/reference.utils';
 import { isSha } from '../../git/utils/revision.utils';
 import { showReferencePicker } from '../../quickpicks/referencePicker';
@@ -161,14 +162,8 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 
 		let gitUri = await GitUri.fromUri(editor.document.uri);
 
-		let uri;
-		if (gitUri.sha != null) {
-			// If we have a sha, normalize the history to the working file (so we get a full history all the time)
-			const workingUri = await this.view.container.git.getWorkingUri(gitUri.repoPath!, gitUri);
-			if (workingUri != null) {
-				uri = workingUri;
-			}
-		}
+		// If we have a sha, normalize the history to the working file (so we get a full history all the time)
+		const uri = await ensureWorkingUri(this.view.container, gitUri);
 
 		if (this.hasUri && uriEquals(uri ?? gitUri, this.uri)) {
 			return true;