refactor(ja-space-after-exclamation): replace match-index with String…

….prototype.matchAll (#72) * refactor(ja-space-after-exclamation): replace match-index with String.prototype.matchAll * deps(ja-space-after-exclamation) remove match-index
textlint-ja · Apr 27, 2024 · 2b2f0d7 · 2b2f0d7
1 parent bbd0fef
commit 2b2f0d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/textlint-rule-ja-space-after-exclamation/package.json b/packages/textlint-rule-ja-space-after-exclamation/package.json
@@ -32,7 +32,6 @@
     "textlint-scripts": "^13.3.3"
   },
   "dependencies": {
-    "match-index": "^1.0.3",
     "textlint-rule-helper": "^2.2.4"
   }
 }
diff --git a/packages/textlint-rule-ja-space-after-exclamation/src/index.js b/packages/textlint-rule-ja-space-after-exclamation/src/index.js
@@ -6,7 +6,6 @@
  文中に感嘆符を使用する場合はスペースを挿入しません。
  */
 import { RuleHelper } from "textlint-rule-helper";
-import { matchCaptureGroupAll } from "match-index";
 function reporter(context) {
     const { Syntax, RuleError, report, fixer, getSource } = context;
     const helper = new RuleHelper();
@@ -18,17 +17,17 @@ function reporter(context) {
             let text = getSource(node);
             // ！の後ろは全角スペースが推奨
             // 半角スペースである場合
-            const matchAfter = /！( )[^\n]/;
-            matchCaptureGroupAll(text, matchAfter).forEach((match) => {
-                const { index } = match;
-                return report(
+            const matchAfter = /！( )[^\n]/g;
+            for (const match of text.matchAll(matchAfter)) {
+                const indexOneBased = match.index + 1;
+                report(
                     node,
                     new RuleError("文末に感嘆符を使用し、後に別の文が続く場合は、直後に全角スペースを挿入します。", {
-                        index: index,
-                        fix: fixer.replaceTextRange([index, index + 1], "　")
+                        index: indexOneBased,
+                        fix: fixer.replaceTextRange([indexOneBased, indexOneBased + 1], "　")
                     })
                 );
-            });
+            }
         }
     };
 }