Merge branch 'main' into pokey/bump-typescript-greater-522

packages/common/src/ide/types/Configuration.ts

@@ -9,6 +9,9 @@ export type CursorlessConfiguration = {
   experimental: { snippetsDir: string | undefined; hatStability: HatStability };
   decorationDebounceDelayMs: number;
   debug: boolean;
+  private: {
+    lineParagraphIterationScope: boolean;
+  };
 };
 
 export type CursorlessConfigKey = keyof CursorlessConfiguration;
@@ -27,6 +30,9 @@ export const CONFIGURATION_DEFAULTS: CursorlessConfiguration = {
     hatStability: HatStability.balanced,
   },
   debug: false,
+  private: {
+    lineParagraphIterationScope: false,
+  },
 };
 
 export interface Configuration {

packages/cursorless-engine/src/languages/getNodeMatcher.ts

@@ -52,7 +52,7 @@ export function getNodeMatcher(
 
 export const languageMatchers: Record<
   LegacyLanguageId,
-  Record<SimpleScopeTypeType, NodeMatcher>
+  Partial<Record<SimpleScopeTypeType, NodeMatcher>>
 > = {
   c: cpp,
   cpp,

packages/cursorless-engine/src/processTargets/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "import/no-default-export": ["error"]
+  }
+}

packages/cursorless-engine/src/processTargets/MarkStageFactoryImpl.ts

@@ -4,12 +4,12 @@ import { StoredTargetMap } from "..";
 import { Mark } from "../typings/TargetDescriptor";
 import { MarkStageFactory } from "./MarkStageFactory";
 import { MarkStage } from "./PipelineStages.types";
-import CursorStage from "./marks/CursorStage";
-import DecoratedSymbolStage from "./marks/DecoratedSymbolStage";
-import ExplicitMarkStage from "./marks/ExplicitMarkStage";
-import LineNumberStage from "./marks/LineNumberStage";
-import NothingStage from "./marks/NothingStage";
-import RangeMarkStage from "./marks/RangeMarkStage";
+import { CursorStage } from "./marks/CursorStage";
+import { DecoratedSymbolStage } from "./marks/DecoratedSymbolStage";
+import { ExplicitMarkStage } from "./marks/ExplicitMarkStage";
+import { LineNumberStage } from "./marks/LineNumberStage";
+import { NothingStage } from "./marks/NothingStage";
+import { RangeMarkStage } from "./marks/RangeMarkStage";
 import { StoredTargetStage } from "./marks/StoredTargetStage";
 import { TargetMarkStage } from "./marks/TargetMarkStage";
 

packages/cursorless-engine/src/processTargets/ModifierStageFactoryImpl.ts

@@ -8,7 +8,7 @@ import { StoredTargetMap } from "..";
 import { LanguageDefinitions } from "../languages/LanguageDefinitions";
 import { ModifierStageFactory } from "./ModifierStageFactory";
 import { ModifierStage } from "./PipelineStages.types";
-import CascadingStage from "./modifiers/CascadingStage";
+import { CascadingStage } from "./modifiers/CascadingStage";
 import { ModifyIfUntypedStage } from "./modifiers/ConditionalModifierStages";
 import { ContainingScopeStage } from "./modifiers/ContainingScopeStage";
 import { EveryScopeStage } from "./modifiers/EveryScopeStage";
@@ -17,27 +17,27 @@ import {
   KeepEmptyFilterStage,
 } from "./modifiers/FilterStages";
 import { HeadStage, TailStage } from "./modifiers/HeadTailStage";
-import InstanceStage from "./modifiers/InstanceStage";
+import { InstanceStage } from "./modifiers/InstanceStage";
 import {
   ExcludeInteriorStage,
   InteriorOnlyStage,
 } from "./modifiers/InteriorStage";
-import ItemStage from "./modifiers/ItemStage";
+import { ItemStage } from "./modifiers/ItemStage";
 import { LeadingStage, TrailingStage } from "./modifiers/LeadingTrailingStages";
 import { OrdinalScopeStage } from "./modifiers/OrdinalScopeStage";
 import { EndOfStage, StartOfStage } from "./modifiers/PositionStage";
-import RangeModifierStage from "./modifiers/RangeModifierStage";
-import RawSelectionStage from "./modifiers/RawSelectionStage";
-import RelativeScopeStage from "./modifiers/RelativeScopeStage";
-import SurroundingPairStage from "./modifiers/SurroundingPairStage";
+import { RangeModifierStage } from "./modifiers/RangeModifierStage";
+import { RawSelectionStage } from "./modifiers/RawSelectionStage";
+import { RelativeScopeStage } from "./modifiers/RelativeScopeStage";
+import { SurroundingPairStage } from "./modifiers/SurroundingPairStage";
 import { ScopeHandlerFactory } from "./modifiers/scopeHandlers/ScopeHandlerFactory";
-import BoundedNonWhitespaceSequenceStage from "./modifiers/scopeTypeStages/BoundedNonWhitespaceStage";
+import { BoundedNonWhitespaceSequenceStage } from "./modifiers/scopeTypeStages/BoundedNonWhitespaceStage";
 import {
   LegacyContainingSyntaxScopeStage,
   SimpleContainingScopeModifier,
   SimpleEveryScopeModifier,
 } from "./modifiers/scopeTypeStages/LegacyContainingSyntaxScopeStage";
-import NotebookCellStage from "./modifiers/scopeTypeStages/NotebookCellStage";
+import { NotebookCellStage } from "./modifiers/scopeTypeStages/NotebookCellStage";
 
 export class ModifierStageFactoryImpl implements ModifierStageFactory {
   constructor(

packages/cursorless-engine/src/processTargets/TargetPipelineRunner.ts

@@ -15,7 +15,7 @@ import { Target } from "../typings/target.types";
 import { MarkStageFactory } from "./MarkStageFactory";
 import { ModifierStageFactory } from "./ModifierStageFactory";
 import { MarkStage, ModifierStage } from "./PipelineStages.types";
-import ImplicitStage from "./marks/ImplicitStage";
+import { ImplicitStage } from "./marks/ImplicitStage";
 import { ContainingTokenIfUntypedEmptyStage } from "./modifiers/ConditionalModifierStages";
 import { PlainTarget } from "./targets";
 import { uniqWithHash } from "../util/uniqWithHash";

packages/cursorless-engine/src/processTargets/marks/CursorStage.ts

@@ -5,7 +5,7 @@ import type { MarkStage } from "../PipelineStages.types";
 import { UntypedTarget } from "../targets";
 import { getActiveSelections } from "./getActiveSelections";
 
-export default class CursorStage implements MarkStage {
+export class CursorStage implements MarkStage {
   constructor(private mark: CursorMark) {}
 
   run(): Target[] {

packages/cursorless-engine/src/processTargets/marks/DecoratedSymbolStage.ts

@@ -3,7 +3,7 @@ import { Target } from "../../typings/target.types";
 import { MarkStage } from "../PipelineStages.types";
 import { UntypedTarget } from "../targets";
 
-export default class implements MarkStage {
+export class DecoratedSymbolStage implements MarkStage {
   constructor(
     private readableHatMap: ReadOnlyHatMap,
     private mark: DecoratedSymbolMark,

packages/cursorless-engine/src/processTargets/marks/ExplicitMarkStage.ts

@@ -4,7 +4,7 @@ import { MarkStage } from "../PipelineStages.types";
 import { UntypedTarget } from "../targets";
 import { ide } from "../../singletons/ide.singleton";
 
-export default class implements MarkStage {
+export class ExplicitMarkStage implements MarkStage {
   constructor(private mark: ExplicitMark) {}
 
   run(): Target[] {

packages/cursorless-engine/src/processTargets/marks/ImplicitStage.ts

@@ -4,7 +4,7 @@ import type { MarkStage } from "../PipelineStages.types";
 import { ImplicitTarget } from "../targets";
 import { getActiveSelections } from "./getActiveSelections";
 
-export default class ImplicitStage implements MarkStage {
+export class ImplicitStage implements MarkStage {
   run(): Target[] {
     return getActiveSelections(ide()).map(
       (selection) =>

packages/cursorless-engine/src/processTargets/marks/LineNumberStage.ts

@@ -5,7 +5,7 @@ import type { MarkStage } from "../PipelineStages.types";
 import { createLineTarget } from "../modifiers/scopeHandlers";
 import { LineTarget } from "../targets";
 
-export default class implements MarkStage {
+export class LineNumberStage implements MarkStage {
   constructor(private mark: LineNumberMark) {}
 
   run(): LineTarget[] {

packages/cursorless-engine/src/processTargets/marks/NothingStage.ts

@@ -2,7 +2,7 @@ import { Target } from "../../typings/target.types";
 import { NothingMark } from "@cursorless/common";
 import { MarkStage } from "../PipelineStages.types";
 
-export default class implements MarkStage {
+export class NothingStage implements MarkStage {
   constructor(private mark: NothingMark) {}
 
   run(): Target[] {

packages/cursorless-engine/src/processTargets/marks/RangeMarkStage.ts

@@ -4,7 +4,7 @@ import { MarkStageFactory } from "../MarkStageFactory";
 import { MarkStage } from "../PipelineStages.types";
 import { targetsToContinuousTarget } from "../TargetPipelineRunner";
 
-export default class RangeMarkStage implements MarkStage {
+export class RangeMarkStage implements MarkStage {
   constructor(
     private markStageFactory: MarkStageFactory,
     private mark: RangeMark,

packages/cursorless-engine/src/processTargets/modifiers/CascadingStage.ts

@@ -7,7 +7,7 @@ import { ModifierStage } from "../PipelineStages.types";
  * Tries each of the given modifiers in turn until one of them doesn't throw an
  * error, returning the output from the first modifier not throwing an error.
  */
-export default class CascadingStage implements ModifierStage {
+export class CascadingStage implements ModifierStage {
   private nestedStages_?: ModifierStage[];
 
   constructor(

packages/cursorless-engine/src/processTargets/modifiers/InstanceStage.ts

@@ -18,7 +18,7 @@ import { ContainingTokenIfUntypedEmptyStage } from "./ConditionalModifierStages"
 import { OutOfRangeError } from "./targetSequenceUtils";
 import { StoredTargetMap } from "../..";
 
-export default class InstanceStage implements ModifierStage {
+export class InstanceStage implements ModifierStage {
   constructor(
     private modifierStageFactory: ModifierStageFactory,
     private storedTargets: StoredTargetMap,

packages/cursorless-engine/src/processTargets/modifiers/ItemStage/ItemStage.ts

@@ -19,7 +19,7 @@ import {
 import { getIterationScope } from "./getIterationScope";
 import { tokenizeRange } from "./tokenizeRange";
 
-export default class ItemStage implements ModifierStage {
+export class ItemStage implements ModifierStage {
   constructor(
     private languageDefinitions: LanguageDefinitions,
     private modifier: ContainingScopeModifier | EveryScopeModifier,

packages/cursorless-engine/src/processTargets/modifiers/ItemStage/index.ts

@@ -1,2 +1 @@
-import ItemStage from "./ItemStage";
-export default ItemStage;
+export * from "./ItemStage";

packages/cursorless-engine/src/processTargets/modifiers/RangeModifierStage.ts

@@ -4,7 +4,7 @@ import { ModifierStageFactory } from "../ModifierStageFactory";
 import { ModifierStage } from "../PipelineStages.types";
 import { targetsToContinuousTarget } from "../TargetPipelineRunner";
 
-export default class RangeModifierStage implements ModifierStage {
+export class RangeModifierStage implements ModifierStage {
   constructor(
     private modifierStageFactory: ModifierStageFactory,
     private modifier: RangeModifier,

packages/cursorless-engine/src/processTargets/modifiers/RawSelectionStage.ts

@@ -3,7 +3,7 @@ import type { RawSelectionModifier } from "@cursorless/common";
 import type { ModifierStage } from "../PipelineStages.types";
 import { RawSelectionTarget } from "../targets";
 
-export default class RawSelectionStage implements ModifierStage {
+export class RawSelectionStage implements ModifierStage {
   constructor(private modifier: RawSelectionModifier) {}
 
   run(target: Target): Target[] {

packages/cursorless-engine/src/processTargets/modifiers/RelativeExclusiveScopeStage.ts

@@ -15,7 +15,7 @@ import { OutOfRangeError } from "./targetSequenceUtils";
  * {@link ScopeHandler.generateScopes} to get the desired scopes, skipping the
  * first scope if input range is empty and is at start of that scope.
  */
-export default class RelativeExclusiveScopeStage implements ModifierStage {
+export class RelativeExclusiveScopeStage implements ModifierStage {
   constructor(
     private modifierStageFactory: ModifierStageFactory,
     private scopeHandlerFactory: ScopeHandlerFactory,

packages/cursorless-engine/src/processTargets/modifiers/RelativeScopeStage.ts

@@ -2,7 +2,7 @@ import type { RelativeScopeModifier } from "@cursorless/common";
 import type { Target } from "../../typings/target.types";
 import { ModifierStageFactory } from "../ModifierStageFactory";
 import type { ModifierStage } from "../PipelineStages.types";
-import RelativeExclusiveScopeStage from "./RelativeExclusiveScopeStage";
+import { RelativeExclusiveScopeStage } from "./RelativeExclusiveScopeStage";
 import { RelativeInclusiveScopeStage } from "./RelativeInclusiveScopeStage";
 import { ScopeHandlerFactory } from "./scopeHandlers/ScopeHandlerFactory";
 
@@ -13,7 +13,7 @@ import { ScopeHandlerFactory } from "./scopeHandlers/ScopeHandlerFactory";
  * delegating to {@link RelativeInclusiveScopeStage} if so, or
  * {@link RelativeExclusiveScopeStage} if not.
  */
-export default class RelativeScopeStage implements ModifierStage {
+export class RelativeScopeStage implements ModifierStage {
   private modiferStage: ModifierStage;
   constructor(
     modifierStageFactory: ModifierStageFactory,

packages/cursorless-engine/src/processTargets/modifiers/SurroundingPairStage.ts

@@ -21,7 +21,7 @@ import { processSurroundingPair } from "./surroundingPair";
  * @returns The new selection expanded to the containing surrounding pair or
  * `null` if none was found
  */
-export default class SurroundingPairStage implements ModifierStage {
+export class SurroundingPairStage implements ModifierStage {
   constructor(
     private languageDefinitions: LanguageDefinitions,
     private modifier: SurroundingPairModifier,

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.test.ts

@@ -1,5 +1,5 @@
 import { TextEditor, Position, Direction, Range } from "@cursorless/common";
-import BaseScopeHandler from "./BaseScopeHandler";
+import { BaseScopeHandler } from "./BaseScopeHandler";
 import { TargetScope } from "./scope.types";
 import {
   CustomScopeType,

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts

@@ -20,7 +20,7 @@ const DEFAULT_REQUIREMENTS: Omit<ScopeIteratorRequirements, "distalPosition"> =
 /**
  * All scope handlers should derive from this base class
  */
-export default abstract class BaseScopeHandler implements ScopeHandler {
+export abstract class BaseScopeHandler implements ScopeHandler {
   public abstract readonly scopeType: ScopeType | undefined;
   public abstract readonly iterationScopeType: ScopeType | CustomScopeType;
 

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts

@@ -16,7 +16,7 @@ const SPLIT_REGEX = /\p{L}\p{M}*|[\p{N}\p{P}\p{S}\p{Z}\p{C}]/gu;
 
 const NONWHITESPACE_REGEX = /\p{L}\p{M}*|[\p{N}\p{P}\p{S}]/gu;
 
-export default class CharacterScopeHandler extends NestedScopeHandler {
+export class CharacterScopeHandler extends NestedScopeHandler {
   public readonly scopeType = { type: "character" } as const;
   public readonly iterationScopeType = { type: "token" } as const;
 

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/DocumentScopeHandler.ts

@@ -1,10 +1,10 @@
 import { TextEditor, Position } from "@cursorless/common";
 import { Direction, ScopeType } from "@cursorless/common";
 import { DocumentTarget } from "../../targets";
-import BaseScopeHandler from "./BaseScopeHandler";
+import { BaseScopeHandler } from "./BaseScopeHandler";
 import { TargetScope } from "./scope.types";
 
-export default class DocumentScopeHandler extends BaseScopeHandler {
+export class DocumentScopeHandler extends BaseScopeHandler {
   public readonly scopeType = { type: "document" } as const;
   public readonly iterationScopeType = { type: "document" } as const;
   protected readonly isHierarchical = false;

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts

@@ -6,7 +6,7 @@ import { generateMatchesInRange } from "../../../util/getMatchesInRange";
 import { TokenTarget } from "../../targets";
 import type { TargetScope } from "./scope.types";
 
-export default class IdentifierScopeHandler extends NestedScopeHandler {
+export class IdentifierScopeHandler extends NestedScopeHandler {
   public readonly scopeType = { type: "identifier" } as const;
   public readonly iterationScopeType = { type: "line" } as const;
 

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/LineScopeHandler.ts

@@ -1,17 +1,25 @@
-import { Position, Range, TextEditor } from "@cursorless/common";
-import { Direction, ScopeType } from "@cursorless/common";
+import {
+  Direction,
+  Position,
+  Range,
+  ScopeType,
+  SimpleScopeTypeType,
+  TextEditor,
+} from "@cursorless/common";
+import { ide } from "../../../singletons/ide.singleton";
 import { LineTarget } from "../../targets";
-import BaseScopeHandler from "./BaseScopeHandler";
+import { BaseScopeHandler } from "./BaseScopeHandler";
 import type { TargetScope } from "./scope.types";
 
-export default class LineScopeHandler extends BaseScopeHandler {
+export class LineScopeHandler extends BaseScopeHandler {
   public readonly scopeType = { type: "line" } as const;
-  public readonly iterationScopeType = { type: "document" } as const;
+  public readonly iterationScopeType: ScopeType;
   protected readonly isHierarchical = false;
   public readonly includeAdjacentInEvery: boolean = true;
 
   constructor(_scopeType: ScopeType, _languageId: string) {
     super();
+    this.iterationScopeType = { type: getIterationScopeTypeType() };
   }
 
   *generateScopeCandidates(
@@ -67,3 +75,10 @@ export function fitRangeToLineContent(editor: TextEditor, range: Range) {
     endLine.lastNonWhitespaceCharacterIndex,
   );
 }
+
+function getIterationScopeTypeType(): SimpleScopeTypeType {
+  const useParagraph = ide().configuration.getOwnConfiguration(
+    "private.lineParagraphIterationScope",
+  );
+  return useParagraph ? "paragraph" : "document";
+}

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts

@@ -1,7 +1,7 @@
 import type { Direction, ScopeType } from "@cursorless/common";
 import { Position, TextEditor } from "@cursorless/common";
 import { flatmap } from "itertools";
-import BaseScopeHandler from "./BaseScopeHandler";
+import { BaseScopeHandler } from "./BaseScopeHandler";
 import { ScopeHandlerFactory } from "./ScopeHandlerFactory";
 import type { TargetScope } from "./scope.types";
 import type {
@@ -21,7 +21,7 @@ import type {
  * the future we may define a nested scope handler that supports hierarchical
  * scope types.
  */
-export default abstract class NestedScopeHandler extends BaseScopeHandler {
+export abstract class NestedScopeHandler extends BaseScopeHandler {
   public abstract readonly iterationScopeType: ScopeType;
   protected readonly isHierarchical = false;
 

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotHierarchicalScopeError.ts

@@ -5,7 +5,7 @@ import { scopeTypeToString } from "./scopeTypeUtil";
  * Throw this error when the user requests a hierarchical feature of a scope
  * that is not hierarchical, eg `"grand line"`.
  */
-export default class NotHierarchicalScopeError extends Error {
+export class NotHierarchicalScopeError extends Error {
   /**
    *
    * @param scopeType The scopeType for the failed match to show to the user

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts

@@ -4,7 +4,7 @@ import {
   Position,
   TextEditor,
 } from "@cursorless/common";
-import BaseScopeHandler from "./BaseScopeHandler";
+import { BaseScopeHandler } from "./BaseScopeHandler";
 import { advanceIteratorsUntil, getInitialIteratorInfos } from "./IteratorInfo";
 import { ScopeHandlerFactory } from "./ScopeHandlerFactory";
 import { compareTargetScopes } from "./compareTargetScopes";
@@ -15,7 +15,7 @@ import {
   ScopeIteratorRequirements,
 } from "./scopeHandler.types";
 
-export default class OneOfScopeHandler extends BaseScopeHandler {
+export class OneOfScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;
 
   static create(