Migrate regex modifiers to scope handlers

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

@@ -36,12 +36,6 @@ import ContainingSyntaxScopeStage, {
   SimpleEveryScopeModifier,
 } from "./modifiers/scopeTypeStages/ContainingSyntaxScopeStage";
 import NotebookCellStage from "./modifiers/scopeTypeStages/NotebookCellStage";
-import {
-  CustomRegexModifier,
-  CustomRegexStage,
-  NonWhitespaceSequenceStage,
-  UrlStage,
-} from "./modifiers/scopeTypeStages/RegexStage";
 import { StoredTargetMap } from "..";
 
 export class ModifierStageFactoryImpl implements ModifierStageFactory {
@@ -131,20 +125,14 @@ export class ModifierStageFactoryImpl implements ModifierStageFactory {
     switch (modifier.scopeType.type) {
       case "notebookCell":
         return new NotebookCellStage(modifier);
-      case "nonWhitespaceSequence":
-        return new NonWhitespaceSequenceStage(modifier);
       case "boundedNonWhitespaceSequence":
         return new BoundedNonWhitespaceSequenceStage(
           this.languageDefinitions,
           this,
           modifier,
         );
-      case "url":
-        return new UrlStage(modifier);
       case "collectionItem":
         return new ItemStage(this.languageDefinitions, modifier);
-      case "customRegex":
-        return new CustomRegexStage(modifier as CustomRegexModifier);
       case "surroundingPair":
         return new SurroundingPairStage(
           this.languageDefinitions,

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

@@ -0,0 +1,63 @@
+import { CustomRegexScopeType, Direction, ScopeType } from "@cursorless/common";
+import { imap } from "itertools";
+import { NestedScopeHandler, ScopeHandlerFactory } from ".";
+import { generateMatchesInRange } from "../../../util/getMatchesInRange";
+import { TokenTarget } from "../../targets";
+import { TargetScope } from "./scope.types";
+
+abstract class RegexStageBase extends NestedScopeHandler {
+  public readonly iterationScopeType: ScopeType = { type: "line" };
+  protected abstract readonly regex: RegExp;
+
+  protected generateScopesInSearchScope(
+    direction: Direction,
+    { editor, domain }: TargetScope,
+  ): Iterable<TargetScope> {
+    return imap(
+      generateMatchesInRange(this.regex, editor, domain, direction),
+      (range) => ({
+        editor,
+        domain: range,
+        getTargets: (isReversed) => [
+          new TokenTarget({
+            editor,
+            contentRange: range,
+            isReversed,
+          }),
+        ],
+      }),
+    );
+  }
+}
+
+export class NonWhitespaceSequenceScopeHandler extends RegexStageBase {
+  regex = /\S+/g;
+}
+
+export class UrlScopeHandler extends RegexStageBase {
+  // taken from https://regexr.com/3e6m0
+  regex =
+    /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g;
+
+  constructor(
+    scopeHandlerFactory: ScopeHandlerFactory,
+    readonly scopeType: ScopeType,
+    languageId: string,
+  ) {
+    super(scopeHandlerFactory, scopeType, languageId);
+  }
+}
+
+export class CustomRegexScopeHandler extends RegexStageBase {
+  get regex() {
+    return new RegExp(this.scopeType.regex, "gu");
+  }
+
+  constructor(
+    scopeHandlerFactory: ScopeHandlerFactory,
+    readonly scopeType: CustomRegexScopeType,
+    languageId: string,
+  ) {
+    super(scopeHandlerFactory, scopeType, languageId);
+  }
+}

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

@@ -1,16 +1,19 @@
 import type { ScopeType } from "@cursorless/common";
 import {
   CharacterScopeHandler,
+  CustomRegexScopeHandler,
   DocumentScopeHandler,
   IdentifierScopeHandler,
   LineScopeHandler,
+  NonWhitespaceSequenceScopeHandler,
   OneOfScopeHandler,
   ParagraphScopeHandler,
+  ScopeHandlerFactory,
   TokenScopeHandler,
+  UrlScopeHandler,
   WordScopeHandler,
 } from ".";
 import { LanguageDefinitions } from "../../../languages/LanguageDefinitions";
-import { ScopeHandlerFactory } from "./ScopeHandlerFactory";
 import type { CustomScopeType, ScopeHandler } from "./scopeHandler.types";
 
 /**
@@ -56,6 +59,16 @@ export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
         return OneOfScopeHandler.create(this, scopeType, languageId);
       case "paragraph":
         return new ParagraphScopeHandler(scopeType, languageId);
+      case "nonWhitespaceSequence":
+        return new NonWhitespaceSequenceScopeHandler(
+          this,
+          scopeType,
+          languageId,
+        );
+      case "url":
+        return new UrlScopeHandler(this, scopeType, languageId);
+      case "customRegex":
+        return new CustomRegexScopeHandler(this, scopeType, languageId);
       case "custom":
         return scopeType.scopeHandler;
       case "instance":

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

@@ -17,4 +17,6 @@ export * from "./OneOfScopeHandler";
 export { default as OneOfScopeHandler } from "./OneOfScopeHandler";
 export * from "./ParagraphScopeHandler";
 export { default as ParagraphScopeHandler } from "./ParagraphScopeHandler";
+export * from "./RegexScopeHandler";
+export * from "./ScopeHandlerFactory";
 export * from "./ScopeHandlerFactoryImpl";