Fix imports

AndreasArvidsson · AndreasArvidsson · commit d15b65ae44fd · 2026-03-12T10:11:54.000+01:00
diff --git a/packages/common/src/scopeVisualizerUtil/generateDecorationsForLineRange.ts b/packages/common/src/scopeVisualizerUtil/generateDecorationsForLineRange.ts
@@ -1,5 +1,6 @@
 import { Range } from "../types/Range";
-import { BorderStyle, type StyledRange } from "./decorationStyle.types";
+import type { StyledRange } from "./decorationStyle.types";
+import { BorderStyle } from "./decorationStyle.types";
 
 export function* generateDecorationsForLineRange(
   startLine: number,
diff --git a/packages/cursorless-engine/src/actions/CopyToClipboard.ts b/packages/cursorless-engine/src/actions/CopyToClipboard.ts
@@ -1,4 +1,5 @@
-import { FlashStyle, type IDE } from "@cursorless/common";
+import type { IDE } from "@cursorless/common";
+import { FlashStyle } from "@cursorless/common";
 import type { RangeUpdater } from "../core/updateSelections/RangeUpdater";
 import { CopyToClipboardSimple } from "./SimpleIdeCommandActions";
 import type { Target } from "../typings/target.types";
diff --git a/packages/cursorless-engine/src/actions/Find.ts b/packages/cursorless-engine/src/actions/Find.ts
@@ -1,4 +1,5 @@
-import { showWarning, type IDE } from "@cursorless/common";
+import type { IDE } from "@cursorless/common";
+import { showWarning } from "@cursorless/common";
 import type { Target } from "../typings/target.types";
 import { ensureSingleTarget } from "../util/targetUtils";
 import type { Actions } from "./Actions";
diff --git a/packages/cursorless-engine/src/actions/FlashTargets.ts b/packages/cursorless-engine/src/actions/FlashTargets.ts
@@ -1,4 +1,5 @@
-import { FlashStyle, type IDE } from "@cursorless/common";
+import type { IDE } from "@cursorless/common";
+import { FlashStyle } from "@cursorless/common";
 import type { Target } from "../typings/target.types";
 import { flashTargets } from "../util/targetUtils";
 import type { ActionReturnValue, SimpleAction } from "./actions.types";
diff --git a/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts
@@ -1,19 +1,19 @@
-import {
-  FlashStyle,
-  Range,
-  matchAll,
-  type IDE,
-  type EditableTextEditor,
-  type Selection,
-  type TextEditor,
+import type {
+  EditableTextEditor,
+  IDE,
+  Selection,
+  TextEditor,
 } from "@cursorless/common";
+import { FlashStyle, Range, matchAll } from "@cursorless/common";
+import type {
+  Snippet,
+  SnippetFile,
+  SnippetHeader,
+  SnippetVariable,
+} from "@cursorless/talon-tools";
 import {
   parseSnippetFile,
   serializeSnippetFile,
-  type Snippet,
-  type SnippetFile,
-  type SnippetHeader,
-  type SnippetVariable,
 } from "@cursorless/talon-tools";
 import type { Snippets } from "../../core/Snippets";
 import type { Target } from "../../typings/target.types";
diff --git a/packages/cursorless-engine/src/actions/IndentLine.ts b/packages/cursorless-engine/src/actions/IndentLine.ts
@@ -1,9 +1,5 @@
-import {
-  FlashStyle,
-  Range,
-  type IDE,
-  type TextEditor,
-} from "@cursorless/common";
+import type { IDE, TextEditor } from "@cursorless/common";
+import { FlashStyle, Range } from "@cursorless/common";
 import { flatten, zip } from "lodash-es";
 import { selectionToStoredTarget } from "../core/commandRunner/selectionToStoredTarget";
 import type { RangeUpdater } from "../core/updateSelections/RangeUpdater";
diff --git a/packages/cursorless-engine/src/actions/InsertEmptyLines.ts b/packages/cursorless-engine/src/actions/InsertEmptyLines.ts
@@ -1,11 +1,10 @@
+import type { IDE, InsertionMode } from "@cursorless/common";
 import {
   FlashStyle,
   RangeExpansionBehavior,
-  type IDE,
   toCharacterRange,
   toLineRange,
   zipStrict,
-  type InsertionMode,
 } from "@cursorless/common";
 import type { RangeUpdater } from "../core/updateSelections/RangeUpdater";
 import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
diff --git a/packages/cursorless-engine/src/actions/PasteFromClipboardDirectly.ts b/packages/cursorless-engine/src/actions/PasteFromClipboardDirectly.ts
@@ -1,10 +1,9 @@
+import type { IDE, TextEditor } from "@cursorless/common";
 import {
   FlashStyle,
   RangeExpansionBehavior,
   toCharacterRange,
   zipStrict,
-  type IDE,
-  type TextEditor,
 } from "@cursorless/common";
 import { flatten } from "lodash-es";
 import type { RangeUpdater } from "../core/updateSelections/RangeUpdater";
diff --git a/packages/cursorless-engine/src/actions/Scroll.ts b/packages/cursorless-engine/src/actions/Scroll.ts
@@ -1,6 +1,6 @@
+import type { IDE } from "@cursorless/common";
 import {
   FlashStyle,
-  type IDE,
   groupBy,
   RevealLineAt,
   toLineRange,
diff --git a/packages/cursorless-engine/src/actions/SetSelection.ts b/packages/cursorless-engine/src/actions/SetSelection.ts
@@ -1,4 +1,5 @@
-import { Selection, type IDE } from "@cursorless/common";
+import type { IDE } from "@cursorless/common";
+import { Selection } from "@cursorless/common";
 import type { Target } from "../typings/target.types";
 import { ensureSingleEditor } from "../util/targetUtils";
 import type { SimpleAction, ActionReturnValue } from "./actions.types";
diff --git a/packages/cursorless-engine/src/cursorlessEngine.ts b/packages/cursorless-engine/src/cursorlessEngine.ts
@@ -26,10 +26,8 @@ import { DisabledSnippets } from "./disabledComponents/DisabledSnippets";
 import { DisabledTalonSpokenForms } from "./disabledComponents/DisabledTalonSpokenForms";
 import { DisabledTreeSitter } from "./disabledComponents/DisabledTreeSitter";
 import { CustomSpokenFormGeneratorImpl } from "./generateSpokenForm/CustomSpokenFormGeneratorImpl";
-import {
-  LanguageDefinitionsImpl,
-  type LanguageDefinitions,
-} from "./languages/LanguageDefinitions";
+import type { LanguageDefinitions } from "./languages/LanguageDefinitions";
+import { LanguageDefinitionsImpl } from "./languages/LanguageDefinitions";
 import { ModifierStageFactoryImpl } from "./processTargets/ModifierStageFactoryImpl";
 import { ScopeHandlerFactoryImpl } from "./processTargets/modifiers/scopeHandlers";
 import { runCommand } from "./runCommand";
diff --git a/packages/cursorless-engine/src/disabledComponents/DisabledTalonSpokenForms.ts b/packages/cursorless-engine/src/disabledComponents/DisabledTalonSpokenForms.ts
@@ -1,8 +1,5 @@
-import {
-  DisabledCustomSpokenFormsError,
-  type SpokenFormEntry,
-  type TalonSpokenForms,
-} from "@cursorless/common";
+import type { SpokenFormEntry, TalonSpokenForms } from "@cursorless/common";
+import { DisabledCustomSpokenFormsError } from "@cursorless/common";
 
 export class DisabledTalonSpokenForms implements TalonSpokenForms {
   getSpokenFormEntries(): Promise<SpokenFormEntry[]> {
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts
@@ -6,10 +6,10 @@ import type {
   TreeSitter,
 } from "@cursorless/common";
 import type * as treeSitter from "web-tree-sitter";
+import type { ScopeCaptureName } from "./captureNames";
 import {
   getNormalizedCaptureIndex,
   getNormalizedCaptureName,
-  type ScopeCaptureName,
 } from "./captureNames";
 import { checkCaptureStartEnd } from "./checkCaptureStartEnd";
 import { getNodeRange } from "./getNodeRange";
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/InteriorStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/InteriorStage.ts
@@ -1,8 +1,7 @@
+import type { InteriorOnlyModifier, ScopeType } from "@cursorless/common";
 import {
   NoContainingScopeError,
   UnsupportedScopeError,
-  type InteriorOnlyModifier,
-  type ScopeType,
 } from "@cursorless/common";
 import type { Target } from "../../typings/target.types";
 import type { ModifierStageFactory } from "../ModifierStageFactory";
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/PreferredScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/PreferredScopeStage.ts
@@ -1,8 +1,5 @@
-import {
-  NoContainingScopeError,
-  type Position,
-  type PreferredScopeModifier,
-} from "@cursorless/common";
+import type { Position, PreferredScopeModifier } from "@cursorless/common";
+import { NoContainingScopeError } from "@cursorless/common";
 import type { Target } from "../../typings/target.types";
 import type { ModifierStageFactory } from "../ModifierStageFactory";
 import type { ModifierStage } from "../PipelineStages.types";
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/createTargetScope.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/createTargetScope.ts
@@ -1,4 +1,5 @@
-import { type TextEditor, Range } from "@cursorless/common";
+import type { TextEditor } from "@cursorless/common";
+import { Range } from "@cursorless/common";
 import { ScopeTypeTarget } from "../../../targets";
 import type { TargetScope } from "../scope.types";
 import { getCollectionItemRemovalRange } from "../util/getCollectionItemRemovalRange";
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/getSeparatorOccurrences.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/getSeparatorOccurrences.ts
@@ -1,4 +1,5 @@
-import { matchAll, Range, type TextDocument } from "@cursorless/common";
+import type { TextDocument } from "@cursorless/common";
+import { matchAll, Range } from "@cursorless/common";
 
 const separator = ",";
 
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotebookCellApiScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotebookCellApiScopeHandler.ts
@@ -1,11 +1,11 @@
-import {
-  Range,
-  type IDE,
-  type Direction,
-  type NotebookCell,
-  type Position,
-  type TextEditor,
+import type {
+  IDE,
+  Direction,
+  NotebookCell,
+  Position,
+  TextEditor,
 } from "@cursorless/common";
+import { Range } from "@cursorless/common";
 import { NotebookCellTarget } from "../../targets";
 import { BaseScopeHandler } from "./BaseScopeHandler";
 import type { TargetScope } from "./scope.types";
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getDelimiterOccurrences.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getDelimiterOccurrences.ts
@@ -1,4 +1,5 @@
-import { matchAllIterator, Range, type TextDocument } from "@cursorless/common";
+import type { TextDocument } from "@cursorless/common";
+import { matchAllIterator, Range } from "@cursorless/common";
 import type { LanguageDefinition } from "../../../../languages/LanguageDefinition";
 import type { QueryCapture } from "../../../../languages/TreeSitterQuery/QueryCapture";
 import { OneWayNestedRangeFinder } from "../util/OneWayNestedRangeFinder";
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getIndividualDelimiters.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getIndividualDelimiters.ts
@@ -6,7 +6,8 @@ import type {
 import { isString } from "@cursorless/common";
 import { concat, uniq } from "lodash-es";
 import { complexDelimiterMap, getSimpleDelimiterMap } from "./delimiterMaps";
-import { DelimiterSide, type IndividualDelimiter } from "./types";
+import type { IndividualDelimiter } from "./types";
+import { DelimiterSide } from "./types";
 
 /**
  * Given a list of delimiters, returns a list where each element corresponds to
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/WordScopeHandler/WordTokenizer.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/WordScopeHandler/WordTokenizer.ts
@@ -1,4 +1,5 @@
-import { matchText, type IDE } from "@cursorless/common";
+import type { IDE } from "@cursorless/common";
+import { matchText } from "@cursorless/common";
 import { getMatcher } from "../../../../tokenizer";
 
 const CAMEL_REGEX = /\p{Lu}?\p{Ll}+|\p{Lu}+(?!\p{Ll})|\p{N}+/gu;
diff --git a/packages/cursorless-engine/src/test/scopes.test.ts b/packages/cursorless-engine/src/test/scopes.test.ts
@@ -16,10 +16,8 @@ import { getScopeTestPathsRecursively } from "@cursorless/node-common";
 import { assert } from "chai";
 import { groupBy, uniq } from "lodash-es";
 import { promises as fsp } from "node:fs";
-import {
-  createTestEnvironment,
-  type TestEnvironment,
-} from "../testUtil/createTestEnvironment";
+import type { TestEnvironment } from "../testUtil/createTestEnvironment";
+import { createTestEnvironment } from "../testUtil/createTestEnvironment";
 import {
   serializeIterationScopeFixture,
   serializeScopeFixture,
diff --git a/packages/cursorless-engine/src/testUtil/createTestEnvironment.ts b/packages/cursorless-engine/src/testUtil/createTestEnvironment.ts
@@ -1,13 +1,11 @@
-import {
-  FakeIDE,
-  InMemoryTextDocument,
-  Selection,
-  type EditableTextEditor,
-  type MessageId,
-  type Messages,
-  type MessageType,
-  type ScopeProvider,
+import type {
+  EditableTextEditor,
+  MessageId,
+  Messages,
+  MessageType,
+  ScopeProvider,
 } from "@cursorless/common";
+import { FakeIDE, InMemoryTextDocument, Selection } from "@cursorless/common";
 import { FileSystemRawTreeSitterQueryProvider } from "@cursorless/node-common";
 import { URI } from "vscode-uri";
 import { createCursorlessEngine } from "..";
diff --git a/packages/cursorless-engine/src/tokenGraphemeSplitter/tokenGraphemeSplitter.test.ts b/packages/cursorless-engine/src/tokenGraphemeSplitter/tokenGraphemeSplitter.test.ts
@@ -1,4 +1,5 @@
-import { FakeIDE, type TokenHatSplittingMode } from "@cursorless/common";
+import type { TokenHatSplittingMode } from "@cursorless/common";
+import { FakeIDE } from "@cursorless/common";
 import * as assert from "assert";
 import { TokenGraphemeSplitter, UNKNOWN } from "./tokenGraphemeSplitter";
 
diff --git a/packages/cursorless-everywhere-talon-core/src/constructTestHelpers.ts b/packages/cursorless-everywhere-talon-core/src/constructTestHelpers.ts
@@ -9,11 +9,11 @@ import type {
   TargetPlainObject,
   TextEditor,
 } from "@cursorless/common";
-import {
-  plainObjectToTarget,
-  type CommandApi,
-  type StoredTargetMap,
+import type {
+  CommandApi,
+  StoredTargetMap,
 } from "@cursorless/cursorless-engine";
+import { plainObjectToTarget } from "@cursorless/cursorless-engine";
 import type { TalonJsIDE } from "./ide/TalonJsIDE";
 import type { TalonJsTestHelpers } from "./types/types";
 
diff --git a/packages/cursorless-everywhere-talon-core/src/extension.ts b/packages/cursorless-everywhere-talon-core/src/extension.ts
@@ -1,10 +1,10 @@
 import "./polyfill";
 
+import type { RunMode } from "@cursorless/common";
 import {
   FakeCommandServerApi,
   FakeIDE,
   NormalizedIDE,
-  type RunMode,
 } from "@cursorless/common";
 import { createCursorlessEngine } from "@cursorless/cursorless-engine";
 import { constructTestHelpers } from "./constructTestHelpers";
diff --git a/packages/cursorless-everywhere-talon-core/src/ide/TalonJsConfiguration.ts b/packages/cursorless-everywhere-talon-core/src/ide/TalonJsConfiguration.ts
@@ -1,14 +1,14 @@
 import { get } from "lodash-es";
-import {
-  HatStability,
-  type Configuration,
-  type ConfigurationScope,
-  type CursorlessConfiguration,
-  type Disposable,
-  type GetFieldType,
-  type Listener,
-  type Paths,
+import type {
+  Configuration,
+  ConfigurationScope,
+  CursorlessConfiguration,
+  Disposable,
+  GetFieldType,
+  Listener,
+  Paths,
 } from "@cursorless/common";
+import { HatStability } from "@cursorless/common";
 
 const CONFIGURATION_DEFAULTS: CursorlessConfiguration = {
   tokenHatSplittingMode: {
diff --git a/packages/cursorless-everywhere-talon-core/src/ide/TalonJsEditor.ts b/packages/cursorless-everywhere-talon-core/src/ide/TalonJsEditor.ts
@@ -1,17 +1,17 @@
-import {
-  selectionsEqual,
-  type Edit,
-  type EditableTextEditor,
-  type GeneralizedRange,
-  type InMemoryTextDocument,
-  type OpenLinkOptions,
-  type Range,
-  type RevealLineAt,
-  type Selection,
-  type SetSelectionsOpts,
-  type TextEditor,
-  type TextEditorOptions,
+import type {
+  Edit,
+  EditableTextEditor,
+  GeneralizedRange,
+  InMemoryTextDocument,
+  OpenLinkOptions,
+  Range,
+  RevealLineAt,
+  Selection,
+  SetSelectionsOpts,
+  TextEditor,
+  TextEditorOptions,
 } from "@cursorless/common";
+import { selectionsEqual } from "@cursorless/common";
 import type { Talon } from "../types/talon.types";
 import { setSelections } from "./setSelections";
 import type { TalonJsIDE } from "./TalonJsIDE";
diff --git a/packages/cursorless-everywhere-talon-core/src/ide/TalonJsMessages.ts b/packages/cursorless-everywhere-talon-core/src/ide/TalonJsMessages.ts
@@ -1,4 +1,5 @@
-import { MessageType, type Messages } from "@cursorless/common";
+import type { Messages } from "@cursorless/common";
+import { MessageType } from "@cursorless/common";
 import type { Talon } from "../types/talon.types";
 
 export class TalonJsMessages implements Messages {
diff --git a/packages/cursorless-everywhere-talon-core/src/ide/createTextEditor.ts b/packages/cursorless-everywhere-talon-core/src/ide/createTextEditor.ts
@@ -1,8 +1,5 @@
-import {
-  InMemoryTextDocument,
-  Selection,
-  type TextDocument,
-} from "@cursorless/common";
+import type { TextDocument } from "@cursorless/common";
+import { InMemoryTextDocument, Selection } from "@cursorless/common";
 import { URI } from "vscode-uri";
 import type { Talon } from "../types/talon.types";
 import type { EditorState, SelectionOffsets } from "../types/types";
diff --git a/packages/cursorless-org-docs/src/docs/components/Code.tsx b/packages/cursorless-org-docs/src/docs/components/Code.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from "react";
-import { codeToHtml, type DecorationItem } from "shiki";
+import type { DecorationItem } from "shiki";
+import { codeToHtml } from "shiki";
 import "./Code.css";
 
 interface Props {
diff --git a/packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx b/packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx
@@ -1,9 +1,8 @@
+import type { ScopeSupportFacetInfo, ScopeTypeType } from "@cursorless/common";
 import {
   prettifyLanguageName,
   prettifyScopeType,
   serializeScopeType,
-  type ScopeSupportFacetInfo,
-  type ScopeTypeType,
 } from "@cursorless/common";
 import { usePluginData } from "@docusaurus/useGlobalData";
 import React, { useState } from "react";
diff --git a/packages/cursorless-org-docs/src/docs/components/calculateHighlights.ts b/packages/cursorless-org-docs/src/docs/components/calculateHighlights.ts
@@ -1,8 +1,8 @@
+import type { DecorationStyle } from "@cursorless/common";
 import {
   generateDecorationsForCharacterRange,
   Range,
   useSingleCornerBorderRadius,
-  type DecorationStyle,
 } from "@cursorless/common";
 import type { DecorationItem } from "shiki";
 import { flattenHighlights } from "./flattenHighlights";
diff --git a/packages/cursorless-org-docs/src/docs/components/flattenHighlights.ts b/packages/cursorless-org-docs/src/docs/components/flattenHighlights.ts
diff --git a/packages/cursorless-org-docs/src/docs/components/util.ts b/packages/cursorless-org-docs/src/docs/components/util.ts
diff --git a/packages/cursorless-org-docs/src/docs/contributing/MissingLanguageScopes.tsx b/packages/cursorless-org-docs/src/docs/contributing/MissingLanguageScopes.tsx
diff --git a/packages/cursorless-org-docs/src/plugins/scope-tests-plugin.ts b/packages/cursorless-org-docs/src/plugins/scope-tests-plugin.ts
diff --git a/packages/cursorless-vscode-e2e/src/suite/performance.vscode.test.ts b/packages/cursorless-vscode-e2e/src/suite/performance.vscode.test.ts
diff --git a/packages/cursorless-vscode-tutorial-webview/src/App.tsx b/packages/cursorless-vscode-tutorial-webview/src/App.tsx
diff --git a/packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/VscodeFancyRangeHighlighterRenderer.ts b/packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/VscodeFancyRangeHighlighterRenderer.ts
diff --git a/packages/meta-updater/src/updateScopeMdx.ts b/packages/meta-updater/src/updateScopeMdx.ts
diff --git a/packages/meta-updater/src/updatesScopeSupportFacetInfos.ts b/packages/meta-updater/src/updatesScopeSupportFacetInfos.ts
diff --git a/packages/node-common/src/getScopeTestPathsRecursively.ts b/packages/node-common/src/getScopeTestPathsRecursively.ts
