fix: support multiple words

textlint-rule · Oct 22, 2021 · fc563e8 · fc563e8
1 parent 1b7392c
commit fc563e8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/textlint-rule-no-duplicate-abbr.ts b/src/textlint-rule-no-duplicate-abbr.ts
@@ -20,11 +20,15 @@ const reporter: TextlintRuleReporter<Options> = (context, options) => {
             const source = getSource(node);
             const words = source.split(/\b/);
             words.forEach((word, index) => {
+                const noSuffix = words[index + 1] == undefined;
+                if (noSuffix) {
+                    return;
+                }
                 // Skip the word
                 if (allowAbbrList.includes(word)) {
                     return;
                 }
-                const hasSpace = /\s/.test(words[index + 1]);
+                const hasSpace = /^\s+$/.test(words[index + 1]);
                 const nextWord = hasSpace ? words[index + 2] : words[index + 1];
                 if (!nextWord) {
                     return;
@@ -33,8 +37,13 @@ const reporter: TextlintRuleReporter<Options> = (context, options) => {
                 if (!matchData) {
                     return;
                 }
+                // ABC  プロトコル
+                // ^^^|^^^^^^^^^
+                // [0] [1]
+                // [1] to be " プロトコル"
+                const normalizedNextWord = nextWord.trimStart();
                 const useDuplicatedSuffixWord = matchData.suffixes.find((suffixWord) => {
-                    return nextWord.startsWith(suffixWord);
+                    return normalizedNextWord.startsWith(suffixWord);
                 });
                 if (useDuplicatedSuffixWord) {
                     const spacer = hasSpace ? words[index + 1] : "";

diff --git a/test/textlint-rule-no-duplicate-abbr.test.ts b/test/textlint-rule-no-duplicate-abbr.test.ts
@@ -2,6 +2,7 @@ import TextLintTester from "textlint-tester";
 import rule from "../src/textlint-rule-no-duplicate-abbr";
 
 const tester = new TextLintTester();
+// @ts-ignore
 tester.run("textlint-rule-no-duplicate-abbr", rule, {
     valid: ["BGP is Border Gateway Protocol.", "npm module is installed by Node package manager"],
     invalid: [
@@ -49,6 +50,24 @@ tester.run("textlint-rule-no-duplicate-abbr", rule, {
                     index: 3
                 }
             ]
+        },
+        // multiple
+        {
+            text: "TCP protocol. UDP protocol. BGP プロトコル",
+            errors: [
+                {
+                    message: `"TCP protocol" has duplicated suffix word. "TCP" stands for "Transmission Control Protocol".`,
+                    index: 0
+                },
+                {
+                    message: `"UDP protocol" has duplicated suffix word. "UDP" stands for "User Datagram Protocol".`,
+                    index: 14
+                },
+                {
+                    message: `"BGP プロトコル" has duplicated suffix word. "BGP" stands for "Border Gateway Protocol".`,
+                    index: 28
+                }
+            ]
         }
     ]
 });