Remove remaining vscode references (#1248)

pokey · web-flow · commit e051b056300d · 2023-02-10T06:04:55.000-07:00
diff --git a/src/actions/Find.ts b/src/actions/Find.ts
@@ -1,3 +1,4 @@
+import { showWarning } from "@cursorless/common";
 import ide from "../libs/cursorless-engine/singletons/ide.singleton";
 import { Target } from "../typings/target.types";
 import { Graph } from "../typings/Types";
@@ -20,7 +21,8 @@ export class FindInWorkspace implements Action {
     let query: string;
     if (text.length > 200) {
       query = text.substring(0, 200);
-      ide().messages.showWarning(
+      showWarning(
+        ide().messages,
         "truncatedSearchText",
         "Search text is longer than 200 characters; truncating",
       );
diff --git a/src/core/Snippets.ts b/src/core/Snippets.ts
@@ -1,7 +1,7 @@
+import { showError } from "@cursorless/common";
 import { readFile, stat } from "fs/promises";
 import { cloneDeep, max, merge } from "lodash";
 import { join } from "path";
-import { window } from "vscode";
 import ide from "../libs/cursorless-engine/singletons/ide.singleton";
 import { walkFiles } from "../testUtil/walkAsync";
 import { Snippet, SnippetMap } from "../typings/snippet";
@@ -128,7 +128,7 @@ export class Snippets {
           this.userSnippetsDir
         }": ${(err as Error).message}`;
 
-        window.showErrorMessage(errorMessage);
+        showError(ide().messages, "snippetsDirError", errorMessage);
 
         this.directoryErrorMessage = {
           directory: this.userSnippetsDir!,
@@ -170,7 +170,9 @@ export class Snippets {
 
             return JSON.parse(content);
           } catch (err) {
-            window.showErrorMessage(
+            showError(
+              ide().messages,
+              "snippetsFileError",
               `Error with cursorless snippets file "${path}": ${
                 (err as Error).message
               }`,
diff --git a/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts b/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts
@@ -21,6 +21,7 @@ import { upgradeV0ToV1 } from "./upgradeV0ToV1";
 import { upgradeV1ToV2 } from "./upgradeV1ToV2";
 import { upgradeV2ToV3 } from "./upgradeV2ToV3";
 import { upgradeV3ToV4 } from "./upgradeV3ToV4";
+import { showWarning } from "@cursorless/common";
 
 /**
  * Given a command argument which comes from the client, normalize it so that it
@@ -135,7 +136,8 @@ export async function checkForOldInference(
     const hideInferenceWarning = globalState.get("hideInferenceWarning");
 
     if (!hideInferenceWarning) {
-      const pressed = await messages.showWarning(
+      const pressed = await showWarning(
+        messages,
         "deprecatedPositionInference",
         'The "past start of" / "past end of" form has changed behavior.  For the old behavior, update cursorless-talon (https://www.cursorless.org/docs/user/updating/), and then you can now say "past start of its" / "past end of its". For example, "take air past end of its line".  You may also consider using "head" / "tail" instead; see https://www.cursorless.org/docs/#head-and-tail',
         "Don't show again",
diff --git a/src/ide/vscode/VscodeFocusEditor.ts b/src/ide/vscode/VscodeFocusEditor.ts
@@ -8,11 +8,11 @@ import {
   window,
 } from "vscode";
 import { getCellIndex } from "../../libs/vscode-common/notebook";
-import { getNotebookFromCellDocument } from "../../util/notebook";
+import { getNotebookFromCellDocument } from "./notebook/notebook";
 import {
   focusNotebookCellLegacy,
   isVscodeLegacyNotebookVersion,
-} from "../../util/notebookLegacy";
+} from "./notebook/notebookLegacy";
 import type VscodeIDE from "./VscodeIDE";
 import { VscodeTextEditorImpl } from "./VscodeTextEditorImpl";
 
diff --git a/src/ide/vscode/VscodeMessages.ts b/src/ide/vscode/VscodeMessages.ts
@@ -1,12 +1,24 @@
 import { window } from "vscode";
-import { MessageId, Messages } from "../../libs/common/ide/types/Messages";
+import {
+  MessageId,
+  Messages,
+  MessageType,
+} from "../../libs/common/ide/types/Messages";
 
 export default class VscodeMessages implements Messages {
-  async showWarning(
+  async showMessage(
+    type: MessageType,
     _id: MessageId,
     message: string,
     ...options: string[]
   ): Promise<string | undefined> {
-    return await window.showWarningMessage(message, ...options);
+    switch (type) {
+      case MessageType.info:
+        return await window.showInformationMessage(message, ...options);
+      case MessageType.warning:
+        return await window.showWarningMessage(message, ...options);
+      case MessageType.error:
+        return await window.showErrorMessage(message, ...options);
+    }
   }
 }
diff --git a/src/ide/vscode/VscodeNotebooks.ts b/src/ide/vscode/VscodeNotebooks.ts
@@ -1,6 +1,6 @@
 import { Selection } from "@cursorless/common";
 import * as vscode from "vscode";
-import { getNotebookFromCellDocument } from "../../util/notebook";
+import { getNotebookFromCellDocument } from "./notebook/notebook";
 import { VscodeTextEditorImpl } from "./VscodeTextEditorImpl";
 
 export async function vscodeEditNewNotebookCellAbove(
diff --git a/src/ide/vscode/hats/VscodeHatRenderer.ts b/src/ide/vscode/hats/VscodeHatRenderer.ts
@@ -2,13 +2,13 @@ import { readFileSync } from "fs";
 import { cloneDeep, isEqual } from "lodash";
 import { join } from "path";
 import * as vscode from "vscode";
-import getHatThemeColors from "../../../core/getHatThemeColors";
+import getHatThemeColors from "./getHatThemeColors";
 import {
   defaultShapeAdjustments,
   DEFAULT_HAT_HEIGHT_EM,
   DEFAULT_VERTICAL_OFFSET_EM,
   IndividualHatAdjustmentMap,
-} from "../../../core/shapeAdjustments";
+} from "./shapeAdjustments";
 import { Listener, Notifier } from "../../../libs/common/util/Notifier";
 import FontMeasurements from "./FontMeasurements";
 import { HatShape, HAT_SHAPES, VscodeHatStyleName } from "../hatStyles.types";
diff --git a/src/ide/vscode/hats/getHatThemeColors.ts b/src/ide/vscode/hats/getHatThemeColors.ts
@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { HatColor } from "../ide/vscode/hatStyles.types";
+import { HatColor } from "../hatStyles.types";
 
 interface OldDecorationColorSetting {
   dark: string;
diff --git a/src/ide/vscode/hats/getStyleName.ts b/src/ide/vscode/hats/getStyleName.ts
@@ -1,8 +1,4 @@
-import {
-  HatColor,
-  HatShape,
-  VscodeHatStyleName,
-} from "../ide/vscode/hatStyles.types";
+import { HatColor, HatShape, VscodeHatStyleName } from "../hatStyles.types";
 
 export function getStyleName(
   color: HatColor,
diff --git a/src/ide/vscode/hats/shapeAdjustments.ts b/src/ide/vscode/hats/shapeAdjustments.ts
@@ -1,4 +1,4 @@
-import { HatShape } from "../ide/vscode/hatStyles.types";
+import { HatShape } from "../hatStyles.types";
 
 export interface HatAdjustments {
   sizeAdjustment?: number;
diff --git a/src/ide/vscode/notebook/notebook.ts b/src/ide/vscode/notebook/notebook.ts
diff --git a/src/ide/vscode/notebook/notebookLegacy.ts b/src/ide/vscode/notebook/notebookLegacy.ts
@@ -2,9 +2,9 @@ import { toVscodeEditor } from "@cursorless/vscode-common";
 import { range } from "lodash";
 import * as semver from "semver";
 import { commands, NotebookDocument, TextDocument, version } from "vscode";
-import type { VscodeTextEditorImpl } from "../ide/vscode/VscodeTextEditorImpl";
-import type VscodeIDE from "../ide/vscode/VscodeIDE";
-import { getCellIndex } from "../libs/vscode-common/notebook";
+import type { VscodeTextEditorImpl } from "../VscodeTextEditorImpl";
+import type VscodeIDE from "../VscodeIDE";
+import { getCellIndex } from "../../../libs/vscode-common/notebook";
 import { getNotebookFromCellDocument } from "./notebook";
 
 export function isVscodeLegacyNotebookVersion() {
diff --git a/src/keyboard/KeyboardCommandsTargeted.ts b/src/keyboard/KeyboardCommandsTargeted.ts
@@ -11,7 +11,7 @@ import {
   PartialTargetDescriptor,
   SimpleScopeTypeType,
 } from "../core/commandRunner/typings/PartialTargetDescriptor.types";
-import { getStyleName } from "../core/getStyleName";
+import { getStyleName } from "../ide/vscode/hats/getStyleName";
 import { HatColor, HatShape } from "../ide/vscode/hatStyles.types";
 import ide from "../libs/cursorless-engine/singletons/ide.singleton";
 import { Graph } from "../typings/Types";
diff --git a/src/languages/markdown.ts b/src/languages/markdown.ts
@@ -1,6 +1,6 @@
 import { Range, Selection, TextEditor } from "@cursorless/common";
 import { SyntaxNode } from "web-tree-sitter";
-import { getMatchesInRange } from "../apps/cursorless-vscode/getMatchesInRange";
+import { getMatchesInRange } from "../util/getMatchesInRange";
 import { SimpleScopeTypeType } from "../core/commandRunner/typings/PartialTargetDescriptor.types";
 import {
   NodeFinder,
diff --git a/src/libs/common/ide/fake/FakeMessages.ts b/src/libs/common/ide/fake/FakeMessages.ts
@@ -1,7 +1,9 @@
-import type { Messages } from "../types/Messages";
+import type { MessageId, Messages, MessageType } from "../types/Messages";
 
 export default class FakeMessages implements Messages {
-  async showWarning(
+  async showMessage(
+    _type: MessageType,
+    _id: MessageId,
     _message: string,
     ..._options: string[]
   ): Promise<string | undefined> {
diff --git a/src/libs/common/ide/spy/SpyMessages.ts b/src/libs/common/ide/spy/SpyMessages.ts
@@ -1,6 +1,4 @@
-import type { MessageId, Messages } from "../types/Messages";
-
-type MessageType = "info" | "warning" | "error";
+import type { MessageId, Messages, MessageType } from "../types/Messages";
 
 export interface Message {
   type: MessageType;
@@ -17,14 +15,15 @@ export default class SpyMessages implements Messages {
 
   constructor(private original: Messages) {}
 
-  showWarning(
+  showMessage(
+    type: MessageType,
     id: MessageId,
     message: string,
     ...options: string[]
   ): Promise<string | undefined> {
-    this.shownMessages.push({ type: "warning", id });
+    this.shownMessages.push({ type, id });
 
-    return this.original.showWarning(id, message, ...options);
+    return this.original.showMessage(type, id, message, ...options);
   }
 
   getSpyValues() {
diff --git a/src/libs/common/ide/types/Messages.ts b/src/libs/common/ide/types/Messages.ts
@@ -1,10 +1,17 @@
 export type MessageId = string;
 
+export enum MessageType {
+  info = "info",
+  warning = "warning",
+  error = "error",
+}
+
 export interface Messages {
   /**
-   * Displays a warning message {@link message} to the user along with possible
+   * Displays a message {@link message} to the user along with possible
    * {@link options} for them to select.
    *
+   * @param type The type of message to display (eg warning, error, info)
    * @param id Each code site where we issue a warning should have a unique,
    * human readable id for testability, eg "deprecatedPositionInference". This
    * allows us to write tests without tying ourself to the specific wording of
@@ -15,7 +22,8 @@ export interface Messages {
    * @returns The option selected by the user, or `undefined` if no option was
    * selected
    */
-  showWarning(
+  showMessage(
+    type: MessageType,
     id: MessageId,
     message: string,
     ...options: string[]
diff --git a/src/libs/common/ide/util/messages.ts b/src/libs/common/ide/util/messages.ts
@@ -0,0 +1,47 @@
+import { MessageId, Messages, MessageType } from "../types/Messages";
+
+/**
+ * Displays a warning message {@link message} to the user along with possible
+ * {@link options} for them to select.
+ *
+ * @param id Each code site where we issue a warning should have a unique,
+ * human readable id for testability, eg "deprecatedPositionInference". This
+ * allows us to write tests without tying ourself to the specific wording of
+ * the warning message provided in {@link message}.
+ * @param message The message to display to the user
+ * @param options A list of options to display to the user. The selected
+ * option will be returned by this function
+ * @returns The option selected by the user, or `undefined` if no option was
+ * selected
+ */
+export function showWarning(
+  messages: Messages,
+  id: MessageId,
+  message: string,
+  ...options: string[]
+): Promise<string | undefined> {
+  return messages.showMessage(MessageType.warning, id, message, ...options);
+}
+
+/**
+ * Displays a error message {@link message} to the user along with possible
+ * {@link options} for them to select.
+ *
+ * @param id Each code site where we issue a error should have a unique,
+ * human readable id for testability, eg "deprecatedPositionInference". This
+ * allows us to write tests without tying ourself to the specific wording of
+ * the error message provided in {@link message}.
+ * @param message The message to display to the user
+ * @param options A list of options to display to the user. The selected
+ * option will be returned by this function
+ * @returns The option selected by the user, or `undefined` if no option was
+ * selected
+ */
+export function showError(
+  messages: Messages,
+  id: MessageId,
+  message: string,
+  ...options: string[]
+): Promise<string | undefined> {
+  return messages.showMessage(MessageType.error, id, message, ...options);
+}
diff --git a/src/libs/common/index.ts b/src/libs/common/index.ts
@@ -13,6 +13,7 @@ export { Message } from "./ide/spy/SpyMessages";
 export { SpyIDERecordedValues } from "./ide/spy/SpyIDE";
 export { default as SpyIDE } from "./ide/spy/SpyIDE";
 export * from "./util";
+export * from "./ide/util/messages";
 export { getKey, splitKey } from "./util/splitKey";
 export { hrtimeBigintToSeconds } from "./util/timeUtils";
 export { walkFilesSync } from "./util/walkSync";
diff --git a/src/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts b/src/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts
@@ -1,6 +1,6 @@
 import { imap } from "itertools";
 import { NestedScopeHandler } from ".";
-import { generateMatchesInRange } from "../../../apps/cursorless-vscode/getMatchesInRange";
+import { generateMatchesInRange } from "../../../util/getMatchesInRange";
 import {
   Direction,
   ScopeType,
diff --git a/src/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts b/src/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts
@@ -2,7 +2,7 @@ import { imap } from "itertools";
 import { NestedScopeHandler } from ".";
 import { getMatcher } from "../../../libs/cursorless-engine/tokenizer";
 import { Direction } from "../../../core/commandRunner/typings/PartialTargetDescriptor.types";
-import { generateMatchesInRange } from "../../../apps/cursorless-vscode/getMatchesInRange";
+import { generateMatchesInRange } from "../../../util/getMatchesInRange";
 import { TokenTarget } from "../../targets";
 import type { TargetScope } from "./scope.types";
 
diff --git a/src/processTargets/modifiers/scopeHandlers/TokenScopeHandler.ts b/src/processTargets/modifiers/scopeHandlers/TokenScopeHandler.ts
@@ -1,6 +1,6 @@
 import { imap } from "itertools";
 import { NestedScopeHandler } from ".";
-import { generateMatchesInRange } from "../../../apps/cursorless-vscode/getMatchesInRange";
+import { generateMatchesInRange } from "../../../util/getMatchesInRange";
 import { Direction } from "../../../core/commandRunner/typings/PartialTargetDescriptor.types";
 import { getMatcher } from "../../../libs/cursorless-engine/tokenizer";
 import { testRegex } from "../../../libs/cursorless-engine/util/regex";
diff --git a/src/scripts/hatAdjustments/add.ts b/src/scripts/hatAdjustments/add.ts
@@ -6,7 +6,7 @@ import {
   defaultShapeAdjustments,
   HatAdjustments,
   IndividualHatAdjustmentMap,
-} from "../../core/shapeAdjustments";
+} from "../../ide/vscode/hats/shapeAdjustments";
 import { HAT_SHAPES } from "../../ide/vscode/hatStyles.types";
 import { postProcessValue } from "./lib";
 
diff --git a/src/scripts/hatAdjustments/average.ts b/src/scripts/hatAdjustments/average.ts
@@ -5,7 +5,7 @@ import {
   defaultShapeAdjustments,
   HatAdjustments,
   IndividualHatAdjustmentMap,
-} from "../../core/shapeAdjustments";
+} from "../../ide/vscode/hats/shapeAdjustments";
 import { HAT_SHAPES } from "../../ide/vscode/hatStyles.types";
 import { postProcessValue } from "./lib";
 
diff --git a/src/typings/Types.ts b/src/typings/Types.ts
@@ -12,7 +12,7 @@ import { ReadOnlyHatMap } from "../core/IndividualHatMap";
 import { Snippets } from "../core/Snippets";
 import StatusBarItem from "../core/StatusBarItem";
 import { RangeUpdater } from "../core/updateSelections/RangeUpdater";
-import { CommandServerApi } from "../libs/vscode-common/getExtensionApi";
+import type { CommandServerApi } from "../libs/vscode-common/getExtensionApi";
 import KeyboardCommands from "../keyboard/KeyboardCommands";
 import { ModifierStage } from "../processTargets/PipelineStages.types";
 import { TestCaseRecorder } from "../testUtil/TestCaseRecorder";
diff --git a/src/util/getMatchesInRange.ts b/src/util/getMatchesInRange.ts
@@ -1,7 +1,7 @@
 import { Range, TextEditor } from "@cursorless/common";
 import { imap } from "itertools";
-import { matchAll } from "../../libs/cursorless-engine/util/regex";
-import { Direction } from "../../core/commandRunner/typings/PartialTargetDescriptor.types";
+import { matchAll } from "../libs/cursorless-engine/util/regex";
+import type { Direction } from "../core/commandRunner/typings/PartialTargetDescriptor.types";
 
 export function getMatchesInRange(
   regex: RegExp,
diff --git a/src/util/unifyRanges.ts b/src/util/unifyRanges.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { HatShape } from "../ide/vscode/hatStyles.types";`
	`1`	`+import { HatShape } from "../hatStyles.types";`
`2`	`2`
`3`	`3`	`export interface HatAdjustments {`
`4`	`4`	`sizeAdjustment?: number;`