refactor: Use text.matchAll instead of sequenceFromRegExpMatch (#5994)

streetsidesoftware · Jul 28, 2024 · ba86668 · ba86668
1 parent 6aa194a
commit ba86668
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/packages/cspell-dictionary/package.json b/packages/cspell-dictionary/package.json
@@ -53,10 +53,10 @@
     "@cspell/cspell-pipe": "workspace:*",
     "@cspell/cspell-types": "workspace:*",
     "cspell-trie-lib": "workspace:*",
-    "fast-equals": "^5.0.1",
-    "gensequence": "^7.0.0"
+    "fast-equals": "^5.0.1"
   },
   "devDependencies": {
+    "gensequence": "^7.0.0",
     "lorem-ipsum": "^2.0.8"
   }
 }
diff --git a/packages/cspell-lib/src/lib/util/text.ts b/packages/cspell-lib/src/lib/util/text.ts
@@ -1,6 +1,5 @@
 import { opConcatMap, opMap, pipe } from '@cspell/cspell-pipe/sync';
 import type { TextDocumentOffset, TextOffset } from '@cspell/cspell-types';
-import { sequenceFromRegExpMatch } from 'gensequence';
 
 import { binarySearch } from './search.js';
 import {
@@ -47,7 +46,9 @@ export function splitCamelCaseWord(word: string): string[] {
  * This function lets you iterate over regular expression matches.
  */
 export function match(reg: RegExp, text: string): Iterable<RegExpExecArray> {
-    return sequenceFromRegExpMatch(reg, text);
+    if (!text) return [];
+    reg = reg.global ? reg : new RegExp(reg.source, reg.flags + 'g');
+    return text.matchAll(reg);
 }
 
 export function matchStringToTextOffset(reg: RegExp, text: string): Iterable<TextOffset> {

diff --git a/packages/cspell-tools/package.json b/packages/cspell-tools/package.json
@@ -54,7 +54,6 @@
     "commander": "^12.1.0",
     "cosmiconfig": "9.0.0",
     "cspell-trie-lib": "workspace:*",
-    "gensequence": "^7.0.0",
     "glob": "^10.4.5",
     "hunspell-reader": "workspace:*",
     "yaml": "^2.5.0"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml