refactor(ja-no-space-between-full-width): replace match-index with St…

…ring.prototype.matchAll (#75) * refactor(ja-no-space-between-full-width): replace match-index with String.prototype.matchAll * deps(ja-no-space-between-full-width) remove match-index
textlint-ja · Apr 27, 2024 · 89b84e5 · 89b84e5
1 parent fadd6dd
commit 89b84e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/packages/textlint-rule-ja-no-space-between-full-width/package.json b/packages/textlint-rule-ja-no-space-between-full-width/package.json
@@ -32,7 +32,6 @@
     "textlint-scripts": "^13.3.3"
   },
   "dependencies": {
-    "match-index": "^1.0.3",
     "regx": "^1.0.4",
     "textlint-rule-helper": "^2.2.4"
   }

diff --git a/packages/textlint-rule-ja-no-space-between-full-width/src/index.js b/packages/textlint-rule-ja-no-space-between-full-width/src/index.js
@@ -6,7 +6,6 @@
  ただしカタカナ複合語の場合を除きます。
  */
 import { RuleHelper } from "textlint-rule-helper";
-import { matchAll } from "match-index";
 import regx from "regx";
 const rx = regx("g");
 const japaneseRegExp =
@@ -24,23 +23,21 @@ function reporter(context) {
             // 全角同士の間は半角スペースを入れない
             const matchReg = rx`${japaneseRegExp}( )${japaneseRegExp}`;
             const katakakana = /[ァ-ヶ]( )[ァ-ヶ]/;
-            matchAll(text, matchReg).forEach((match) => {
-                const { input, captureGroups } = match;
+            for (const match of text.matchAll(matchReg)) {
+                const input = match[1];
                 // ただしカタカナ複合語の場合を除きます。
                 if (katakakana.test(input)) {
                     return;
                 }
-                captureGroups.forEach((captureGroup) => {
-                    const index = captureGroup.index;
-                    report(
-                        node,
-                        new RuleError("原則として、全角文字どうしの間にスペースを入れません。", {
-                            index: index,
-                            fix: fixer.replaceTextRange([index, index + 1], "")
-                        })
-                    );
-                });
-            });
+                const indexOneBased = match.index + 1;
+                report(
+                    node,
+                    new RuleError("原則として、全角文字どうしの間にスペースを入れません。", {
+                        index: indexOneBased,
+                        fix: fixer.replaceTextRange([indexOneBased, indexOneBased + 1], "")
+                    })
+                );
+            }
         }
     };
 }