Handle angle brackets within an error node

src/processTargets/modifiers/surroundingPair/findSurroundingPairParseTreeBased.ts

@@ -6,6 +6,7 @@ import {
   SurroundingPairDirection,
 } from "../../../typings/Types";
 import { getNodeRange } from "../../../util/nodeSelectors";
+import { isContainedInErrorNode } from "../../../util/treeSitterUtils";
 import { extractSelectionFromSurroundingPairOffsets } from "./extractSelectionFromSurroundingPairOffsets";
 import { findSurroundingPairCore } from "./findSurroundingPairCore";
 import { getIndividualDelimiters } from "./getIndividualDelimiters";
@@ -205,7 +206,8 @@ function findSurroundingPairContainedInNode(
           // looking at its position within its parent node.
           if (
             delimiterInfo.delimiter === "angleBrackets" &&
-            inferDelimiterSide(delimiterNode) !== delimiterInfo.side
+            inferDelimiterSide(delimiterNode) !== delimiterInfo.side &&
+            !isContainedInErrorNode(delimiterNode)
           ) {
             return undefined;
           }

src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml

@@ -0,0 +1,23 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: {type: surroundingPair, delimiter: any}
+initialState:
+  documentContents: foo<bar>
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+  thatMark:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]

src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml

@@ -0,0 +1,23 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: {type: surroundingPair, delimiter: any}
+initialState:
+  documentContents: foo<>
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+  thatMark:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]

src/util/treeSitterUtils.ts

@@ -36,3 +36,33 @@ export function getChildNodesForFieldName(
 
   return ret;
 }
+
+/**
+ * Returns a list of the node's ancestors, including the node itself if
+ * `includeNode` is `true`
+ * @param node The node to iterate ancestors from
+ * @param includeNode Whether to include the node itself in the returned list
+ * @returns A list of ancestors possibly including the includeNode node itself
+ */
+export function getAncestors(node: SyntaxNode, includeNode: boolean = true) {
+  const ancestors: SyntaxNode[] = includeNode ? [node] : [];
+
+  for (
+    let currentNode: SyntaxNode | null = node.parent;
+    currentNode != null;
+    currentNode = currentNode.parent
+  ) {
+    ancestors.push(currentNode);
+  }
+
+  return ancestors;
+}
+
+/**
+ * Determines whether the given node or one of its ancestors is an error node
+ * @param node The node to check
+ * @returns True if the given node is contained in an error node
+ */
+export function isContainedInErrorNode(node: SyntaxNode) {
+  return getAncestors(node).some((ancestor) => ancestor.type === "ERROR");
+}