Start making factory for vscodeIde

Author: pokey

packages/cursorless-vscode-core/src/compositionRoot/createVscodeIde.ts

@@ -0,0 +1,19 @@
+import * as vscode from "vscode";
+import { VscodeHats, VscodeIDE } from "..";
+import { FakeFontMeasurements } from "../ide/vscode/hats/FakeFontMeasurements";
+import { FontMeasurementsImpl } from "../ide/vscode/hats/FontMeasurementsImpl";
+
+export async function createVscodeIde(context: vscode.ExtensionContext) {
+  const vscodeIDE = new VscodeIDE(context);
+
+  const hats = new VscodeHats(
+    vscodeIDE,
+    context,
+    vscodeIDE.runMode === "test"
+      ? new FakeFontMeasurements()
+      : new FontMeasurementsImpl(context),
+  );
+  await hats.init();
+
+  return { vscodeIDE, hats };
+}

packages/cursorless-vscode-core/src/index.ts

@@ -2,7 +2,6 @@ export * from "./StatusBarItem";
 export * from "./commands";
 export * from "./ide/vscode/VscodeIDE";
 export * from "./ide/vscode/hats/VscodeHats";
-export * from "./ide/vscode/hats/FontMeasurementsImpl";
-export * from "./ide/vscode/hats/FakeFontMeasurements";
 export * from "./ide/vscode/toVscodeEditor";
 export * from "./keyboard/KeyboardCommands";
+export * from "./compositionRoot/createVscodeIde";

packages/cursorless-vscode/src/extension.ts

@@ -11,17 +11,15 @@ import {
   TreeSitter,
 } from "@cursorless/cursorless-engine";
 import {
-  FakeFontMeasurements,
-  FontMeasurementsImpl,
+  createVscodeIde,
   KeyboardCommands,
   StatusBarItem,
-  VscodeHats,
-  VscodeIDE,
 } from "@cursorless/cursorless-vscode-core";
 import {
   CursorlessApi,
   getCommandServerApi,
   getParseTreeApi,
+  ParseTreeApi,
   toVscodeRange,
 } from "@cursorless/vscode-common";
 import * as vscode from "vscode";
@@ -41,28 +39,14 @@ export async function activate(
 ): Promise<CursorlessApi> {
   const parseTreeApi = await getParseTreeApi();
 
-  const vscodeIDE = new VscodeIDE(context);
-
-  const hats = new VscodeHats(
-    vscodeIDE,
-    context,
-    vscodeIDE.runMode === "test"
-      ? new FakeFontMeasurements()
-      : new FontMeasurementsImpl(context),
-  );
+  const { vscodeIDE, hats } = await createVscodeIde(context);
 
   const commandServerApi =
     vscodeIDE.runMode === "test"
       ? getFakeCommandServerApi()
       : await getCommandServerApi();
 
-  const getNodeAtLocation = (document: TextDocument, range: Range) => {
-    return parseTreeApi.getNodeAtLocation(
-      new vscode.Location(document.uri, toVscodeRange(range)),
-    );
-  };
-
-  const treeSitter: TreeSitter = { getNodeAtLocation };
+  const treeSitter: TreeSitter = createTreeSitter(parseTreeApi);
 
   const normalizedIde =
     vscodeIDE.runMode === "production"
@@ -119,6 +103,16 @@ export async function activate(
   };
 }
 
+function createTreeSitter(parseTreeApi: ParseTreeApi): TreeSitter {
+  return {
+    getNodeAtLocation(document: TextDocument, range: Range) {
+      return parseTreeApi.getNodeAtLocation(
+        new vscode.Location(document.uri, toVscodeRange(range)),
+      );
+    },
+  };
+}
+
 // this method is called when your extension is deactivated
 export function deactivate() {
   // do nothing