More clean up

cursorless-dev · Dec 26, 2024 · 3dcac4f · 3dcac4f
1 parent db385da
commit 3dcac4f
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/...essTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getDelimiterOccurrences.ts b/...essTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getDelimiterOccurrences.ts
@@ -38,15 +38,6 @@ export function getDelimiterOccurrences(
     ]),
   );
 
-  const isDisqualified = (range: Range): boolean => {
-    const delimiter = disqualifyDelimitersIterator.getContaining(range);
-    return delimiter != null && !delimiter.hasError();
-  };
-
-  const getTextFragmentRange = (range: Range): Range | undefined => {
-    return textFragmentsIterator.getContaining(range)?.range;
-  };
-
   const matchIterator = matchAllIterator(
     document.getText(),
     getDelimiterRegex(individualDelimiters),
@@ -61,10 +52,13 @@ export function getDelimiterOccurrences(
       document.positionAt(match.index! + text.length),
     );
 
-    if (!isDisqualified(range)) {
+    const delimiter = disqualifyDelimitersIterator.getContaining(range);
+    const isDisqualified = delimiter != null && !delimiter.hasError();
+
+    if (!isDisqualified) {
       results.push({
         delimiterInfo: delimiterTextToDelimiterInfoMap[text],
-        textFragmentRange: getTextFragmentRange(range),
+        textFragmentRange: textFragmentsIterator.getContaining(range)?.range,
         range,
       });
     }