chore(deps): Load and use vscode.git extension

Signed-off-by: Lorenz Leutgeb <[email protected]>

Author: lorenzleutgeb

src/utils/git.ts

@@ -1,4 +1,5 @@
-import type { GitExtensionAPI } from '../types'
+import * as vscode from 'vscode'
+import type { GitExtension, GitExtensionAPI } from '../types'
 import { exec } from '.'
 
 /**
@@ -36,14 +37,13 @@ export function getCurrentGitBranch(): string | undefined {
   return currentBranch
 }
 
-// TODO(lorenzleutgeb): Get some typings for vscode!
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-declare const vscode: any
-
 export function getGitExtensionAPI(): GitExtensionAPI {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-  const gitExtension = vscode.extensions.getExtension('vscode.git').exports
+  const gitExtensionId = 'vscode.git'
+  const gitExtension = vscode.extensions.getExtension<GitExtension>(gitExtensionId)
+
+  if (gitExtension === undefined) {
+    throw new Error(`Could not load VSCode Git extension with id '${gitExtensionId}'`)
+  }
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-  return gitExtension.getAPI(1) as GitExtensionAPI
+  return gitExtension.exports.getAPI(1)
 }

src/ux/patchesView.ts

@@ -16,11 +16,18 @@ import {
   fetchFromHttpd,
   memoizedGetCurrentProjectId,
 } from '../helpers'
-import { type AugmentedPatch, type Patch, type Unarray, isPatch } from '../types'
+import {
+  type AugmentedPatch,
+  type GitExtensionAPI,
+  type Patch,
+  type Unarray,
+  isPatch,
+} from '../types'
 import {
   assertUnreachable,
   capitalizeFirstLetter,
   getFirstAndLatestRevisions,
+  getGitExtensionAPI,
   getIdentityAliasOrId,
   getRepoRoot,
   getTimeAgo,
@@ -161,21 +168,9 @@ export const patchesTreeDataProvider: TreeDataProvider<
           const filename = Path.basename(filePath)
           const absPath = `${getRepoRoot()}${sep}${filePath}`
 
-          /*
-          TODO(lorenzleutgeb): Instead of constructing GitUris ourselves, use API of Git Extension.
           const gitExtensionApi: GitExtensionAPI = getGitExtensionAPI()
-          const mkUri = (ref: string) => gitExtensionApi.toGitUri(Uri.from({ scheme: 'file', path: absPath }), ref);
-          */
-
           const mkUri = (ref: string) =>
-            Uri.from({
-              scheme: 'git',
-              path: absPath,
-              query: JSON.stringify({
-                path: absPath,
-                ref,
-              }),
-            })
+            gitExtensionApi.toGitUri(Uri.from({ scheme: 'file', path: absPath }), ref)
 
           const oldVersionUri = mkUri(oldVersionCommitSha)
           const newVersionUri = mkUri(newVersionCommitSha)