Textual paired delimiters

src/core/tokenizer.ts

@@ -1,3 +1,5 @@
+import { matchAll } from "../util/regex";
+
 const REPEATABLE_SYMBOLS = [
   "+",
   "-",
@@ -55,7 +57,7 @@ export function tokenize<T>(
   text: string,
   mapfn: (v: RegExpMatchArray, k: number) => T
 ) {
-  return Array.from(text.matchAll(TOKEN_MATCHER), mapfn);
+  return matchAll(text, TOKEN_MATCHER, mapfn);
 }
 
 //https://stackoverflow.com/a/6969486

src/errors.ts

@@ -0,0 +1,8 @@
+export class UnsupportedLanguageError extends Error {
+  constructor(languageId: string) {
+    super(
+      `Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/main/docs/adding-a-new-language.md`
+    );
+    this.name = "UnsupportedLanguageError";
+  }
+}

src/languages/index.ts

@@ -13,6 +13,7 @@ import java from "./java";
 import json from "./json";
 import python from "./python";
 import typescript from "./typescript";
+import { UnsupportedLanguageError } from "../errors";
 
 const languageMatchers: Record<string, Record<ScopeType, NodeMatcher>> = {
   c: cpp,
@@ -36,9 +37,7 @@ export function getNodeMatcher(
   const matchers = languageMatchers[languageId];
 
   if (matchers == null) {
-    throw Error(
-      `Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/main/docs/adding-a-new-language.md`
-    );
+    throw new UnsupportedLanguageError(languageId);
   }
 
   const matcher = matchers[scopeType];

src/processTargets/index.ts

@@ -9,7 +9,7 @@ import {
   TypedSelection,
 } from "../typings/Types";
 import processMark from "./processMark";
-import processModifier from "./processModifier";
+import processModifier from "./modifiers/processModifier";
 import processPosition from "./processPosition";
 import processSelectionType from "./processSelectionType";
 import { isForward as getIsForward } from "../util/selectionUtils";

src/processTargets/processModifier.ts → src/processTargets/modifiers/processModifier.ts

@@ -2,10 +2,9 @@ import update from "immutability-helper";
 import { range } from "lodash";
 import { Location, Position, Range, Selection } from "vscode";
 import { SyntaxNode } from "web-tree-sitter";
-import { SUBWORD_MATCHER } from "../core/constants";
-import { getNodeMatcher } from "../languages";
-import { createSurroundingPairMatcher } from "../languages/surroundingPair";
-import { selectionWithEditorFromRange } from "../util/selectionUtils";
+import { SUBWORD_MATCHER } from "../../core/constants";
+import { getNodeMatcher } from "../../languages";
+import { selectionWithEditorFromRange } from "../../util/selectionUtils";
 import {
   ContainingScopeModifier,
   HeadModifier,
@@ -15,11 +14,11 @@ import {
   SelectionContext,
   SelectionWithEditor,
   SubTokenModifier,
-  SurroundingPairModifier,
   TailModifier,
-} from "../typings/Types";
+} from "../../typings/Types";
+import { processSurroundingPair } from "./surroundingPair";
 
-type SelectionWithContext = {
+export type SelectionWithEditorWithContext = {
   selection: SelectionWithEditor;
   context: SelectionContext;
 };
@@ -28,7 +27,7 @@ export default function (
   context: ProcessedTargetsContext,
   target: PrimitiveTarget,
   selection: SelectionWithEditor
-): SelectionWithContext[] {
+): SelectionWithEditorWithContext[] {
   const { modifier } = target;
   let result;
 
@@ -66,7 +65,7 @@ function processScopeType(
   context: ProcessedTargetsContext,
   selection: SelectionWithEditor,
   modifier: ContainingScopeModifier
-): SelectionWithContext[] | null {
+): SelectionWithEditorWithContext[] | null {
   const nodeMatcher = getNodeMatcher(
     selection.editor.document.languageId,
     modifier.scopeType,
@@ -93,7 +92,7 @@ function processSubToken(
   context: ProcessedTargetsContext,
   selection: SelectionWithEditor,
   modifier: SubTokenModifier
-): SelectionWithContext[] | null {
+): SelectionWithEditorWithContext[] | null {
   const token = selection.editor.document.getText(selection.selection);
   let pieces: { start: number; end: number }[] = [];
 
@@ -190,7 +189,7 @@ function processHeadTail(
   context: ProcessedTargetsContext,
   selection: SelectionWithEditor,
   modifier: HeadModifier | TailModifier
-): SelectionWithContext[] | null {
+): SelectionWithEditorWithContext[] | null {
   let anchor: Position, active: Position;
   if (modifier.type === "head") {
     anchor = selection.selection.end;
@@ -210,22 +209,7 @@ function processHeadTail(
   ];
 }
 
-function processSurroundingPair(
-  context: ProcessedTargetsContext,
-  selection: SelectionWithEditor,
-  modifier: SurroundingPairModifier
-): SelectionWithContext[] | null {
-  const node: SyntaxNode | null = context.getNodeAtLocation(
-    new Location(selection.editor.document.uri, selection.selection)
-  );
-  const nodeMatcher = createSurroundingPairMatcher(
-    modifier.delimiter,
-    modifier.delimitersOnly
-  );
-  return findNearestContainingAncestorNode(node, nodeMatcher, selection);
-}
-
-function findNearestContainingAncestorNode(
+export function findNearestContainingAncestorNode(
   startNode: SyntaxNode,
   nodeMatcher: NodeMatcher,
   selection: SelectionWithEditor

src/processTargets/modifiers/surroundingPair/constants.ts

@@ -0,0 +1,14 @@
+// XXX: Make this language-specific if it starts to get unwieldy
+/**
+ * A list of node types that are allowed to be parents of an angle bracket.
+ * Having this list allows us to avoid trying to treat a greater-than sign as an
+ * angle bracket
+ */
+export const ALLOWABLE_ANGLE_BRACKET_PARENTS = [
+  "end_tag",
+  "jsx_closing_element",
+  "jsx_opening_element",
+  "jsx_self_closing_element",
+  "self_closing_tag",
+  "start_tag",
+];

src/processTargets/modifiers/surroundingPair/delimiterMaps.ts

@@ -0,0 +1,38 @@
+import {
+  ComplexSurroundingPairName,
+  SimpleSurroundingPairName,
+} from "../../../typings/Types";
+
+type IndividualDelimiterText = string | string[];
+
+export const delimiterToText: Record<
+  SimpleSurroundingPairName,
+  [IndividualDelimiterText, IndividualDelimiterText]
+> = {
+  angleBrackets: ["<", ">"],
+  backtickQuotes: ["`", "`"],
+  curlyBrackets: [["{", "${"], "}"],
+  doubleQuotes: ['"', '"'],
+  escapedDoubleQuotes: ['\\"', '\\"'],
+  escapedParentheses: ["\\(", "\\)"],
+  escapedSingleQuotes: ["\\'", "\\'"],
+  parentheses: [["(", "$("], ")"],
+  singleQuotes: ["'", "'"],
+  squareBrackets: ["[", "]"],
+};
+
+export const leftToRightMap: Record<string, string> = Object.fromEntries(
+  Object.values(delimiterToText)
+);
+
+/**
+ * Some surrounding pair scope types are really just shorthand for multiple
+ * acceptable delimiters.  This map defines these surrounding pairs.
+ */
+export const complexDelimiterMap: Record<
+  ComplexSurroundingPairName,
+  SimpleSurroundingPairName[]
+> = {
+  any: Object.keys(delimiterToText),
+  string: ["singleQuotes", "doubleQuotes", "backtickQuotes"],
+};