Lazy load git dependency

Author: AndreasArvidsson

package.json

@@ -2,7 +2,7 @@
     "name": "andreas-talon",
     "displayName": "Andreas Talon",
     "description": "VSCode extension used by Talon Voice",
-    "version": "3.62.0",
+    "version": "3.63.0",
     "publisher": "AndreasArvidsson",
     "license": "MIT",
     "main": "./out/extension.js",

src/commands/GitUtil.ts

@@ -1,22 +1,27 @@
 import { Range, TextDocument } from "vscode";
-import { API, GitExtension, Remote, Repository } from "../typings/git";
+import { API, Remote, Repository } from "../typings/git";
 import { getActiveFileSchemaEditor } from "../util/getActiveEditor";
+import { getGitExtension } from "../util/getExtension";
 
 export type GitParameters = {
     useSelection: boolean;
     useBranch: boolean;
 };
 
-export class GitUtil {
-    private gitApi: API;
+let _gitApi: API;
 
-    constructor(gitExtension: GitExtension) {
-        this.gitApi = gitExtension.getAPI(1);
+async function gitApi(): Promise<API> {
+    if (_gitApi == null) {
+        const gitExtension = await getGitExtension();
+        _gitApi = gitExtension.getAPI(1);
     }
+    return _gitApi;
+}
 
-    getFileURL({ useSelection = false, useBranch = false }: GitParameters): string {
+export class GitUtil {
+    async getFileURL({ useSelection = false, useBranch = false }: GitParameters): Promise<string> {
         const { document, selections } = getActiveFileSchemaEditor();
-        const repository = this.getRepository();
+        const repository = await this.getRepository();
         const platform = getPlatform(repository);
         const relativeFilePath = getRelativeFilepath(repository, document.uri.path);
         const range = useSelection ? selections[0] : undefined;
@@ -35,28 +40,28 @@ export class GitUtil {
         return platform.getFileUrl(commitOrBranch, relativeFilePath, range);
     }
 
-    getRepoURL(): string {
-        const repository = this.getRepository();
+    async getRepoURL(): Promise<string> {
+        const repository = await this.getRepository();
         return getPlatform(repository).getRepoUrl();
     }
 
-    getIssuesURL(): string {
-        const repository = this.getRepository();
+    async getIssuesURL(): Promise<string> {
+        const repository = await this.getRepository();
         return getPlatform(repository).getIssuesUrl();
     }
 
-    getNewIssueURL(): string {
-        const repository = this.getRepository();
+    async getNewIssueURL(): Promise<string> {
+        const repository = await this.getRepository();
         return getPlatform(repository).getNewIssueUrl();
     }
 
-    getPullRequestsURL(): string {
-        const repository = this.getRepository();
+    async getPullRequestsURL(): Promise<string> {
+        const repository = await this.getRepository();
         return getPlatform(repository).getPullRequestsURL();
     }
 
     async checkout(branches: string[]) {
-        const repository = this.getRepository();
+        const repository = await this.getRepository();
         for (const branch of branches) {
             try {
                 await repository.checkout(branch);
@@ -68,8 +73,8 @@ export class GitUtil {
         throw Error(`Can't checkout branch '${branches.join(", ")}'`);
     }
 
-    private getRepository(): Repository {
-        const { repositories } = this.gitApi;
+    private async getRepository(): Promise<Repository> {
+        const { repositories } = await gitApi();
         if (repositories.length === 0) {
             throw Error("No git repositories available");
         }

src/commands/registerCommands.ts

@@ -1,7 +1,6 @@
 import * as vscode from "vscode";
 import type { TreeSitter } from "../treeSitter/TreeSitter";
 import type { CommandServerExtension } from "../typings/commandServer";
-import type { GitExtension } from "../typings/git";
 import { getFullCommand } from "../util/getFullCommand";
 import { GetText } from "./GetText";
 import { GitParameters, GitUtil } from "./GitUtil";
@@ -29,11 +28,10 @@ type Callback = (...args: any[]) => any;
 
 export function registerCommands(
     commandServerExtension: CommandServerExtension,
-    gitExtension: GitExtension,
     treeSitter: TreeSitter
 ): vscode.Disposable {
     const getText = new GetText(commandServerExtension, treeSitter);
-    const git = new GitUtil(gitExtension);
+    const git = new GitUtil();
 
     const commands: Record<CommandId, Callback> = {
         // Files

src/extension.ts

@@ -7,11 +7,7 @@ import { registerLanguageFormatters } from "./language/registerLanguageFormatter
 import { registerStateUpdater } from "./stateUpdater";
 import { createTabView } from "./tabView";
 import { TreeSitter } from "./treeSitter/TreeSitter";
-import {
-    getCommandServerExtension,
-    getGitExtension,
-    getParseTreeExtension
-} from "./util/getExtension";
+import { getCommandServerExtension, getParseTreeExtension } from "./util/getExtension";
 import { getFakeCommandServerExtension } from "./util/getFakeCommandServerExtension";
 import { isTesting } from "./util/isTesting";
 
@@ -26,7 +22,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
 async function activateExtension(context: vscode.ExtensionContext): Promise<void> {
     const parseTreeExtension = await getParseTreeExtension();
-    const gitExtension = await getGitExtension();
     const commandServerExtension = isTesting
         ? getFakeCommandServerExtension()
         : await getCommandServerExtension();
@@ -39,7 +34,7 @@ async function activateExtension(context: vscode.ExtensionContext): Promise<void
     }
 
     context.subscriptions.push(
-        registerCommands(commandServerExtension, gitExtension, treeSitter),
+        registerCommands(commandServerExtension, treeSitter),
         registerLanguageDefinitions(),
         registerLanguageCompletionProviders(),
         registerLanguageCodeActions(treeSitter),