Merge pull request #4 from azu/refactor-use-ignoreNodeManager

refactor(rule): use IgnoreNodeManager

Author: azu

package.json

@@ -36,17 +36,17 @@
   ],
   "devDependencies": {
     "babel-cli": "^6.5.1",
-    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-preset-es2015": "^6.5.0",
     "babel-register": "^6.5.2",
     "mocha": "^2.4.5",
     "textlint": "^6.0.1",
     "textlint-tester": "^1.1.0"
   },
   "dependencies": {
-    "rousseau": "^1.0.0",
     "object-assign": "^4.0.1",
-    "textlint-rule-helper": "^1.1.5",
+    "rousseau": "^1.0.0",
+    "textlint-rule-helper": "^1.2.0",
     "textlint-util-to-string": "^1.2.0"
   }
 }

src/textlint-rule-rousseau.js

@@ -1,6 +1,6 @@
 // LICENSE : MIT
 "use strict";
-const {RuleHelper} = require("textlint-rule-helper");
+import {RuleHelper, IgnoreNodeManger} from "textlint-rule-helper";
 const StringSource = require("textlint-util-to-string").default;
 const rousseau = require("rousseau");
 const ObjectAssign = require("object-assign");
@@ -27,6 +27,7 @@ const mapNode = function (ast, mapFn) {
 
 export default function textlintRousseau(context, options = defaultOptions) {
     const helper = new RuleHelper(context);
+    const ignoreNodeManager = new IgnoreNodeManger();
     const {Syntax, RuleError, report, getSource} = context;
     const showLevels = options.showLevels || defaultOptions.showLevels;
     const ignoreTypes = options.ignoreTypes || defaultOptions.ignoreTypes;
@@ -83,6 +84,10 @@ export default function textlintRousseau(context, options = defaultOptions) {
             return;
         }
         const index = source.originalIndexFromIndex(result.index);
+        // if already ignored, should not report
+        if (ignoreNodeManager.isIgnoredIndex(index)) {
+            return;
+        }
         const suggestions = createSuggest(result.replacements);
         const ruleError = new RuleError(`${level}(${type}) ${result.message}${suggestions}`, {
             index
@@ -92,25 +97,15 @@ export default function textlintRousseau(context, options = defaultOptions) {
 
     return {
         [Syntax.Paragraph](node){
+            // ignore if wrapped node types
             if (helper.isChildNode(node, [Syntax.Link, Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {
                 return;
             }
-            const filteredNode = mapNode(node, (node) => {
-                const index = ignoreInlineNodeTypes.indexOf(node.type);
-                if (index === -1) {
-                    return node;
-                }
-                /*
-                `xxx` => code
-                 */
-                return ObjectAssign({}, node, {
-                    value: node.type.toLocaleLowerCase()
-                });
-            });
-            if (!filteredNode) {
-                return;
-            }
-            const source = new StringSource(filteredNode);
+            // ignore if contain child node types
+            ignoreNodeManager.ignoreChildrenByTypes(node, ignoreInlineNodeTypes);
+            // check
+
+            const source = new StringSource(node);
             const text = source.toString();
             const reportSourceError = (results) => {
                 reportError(node, source, results);

test/textlint-rule-rousseau-test.js

@@ -13,6 +13,7 @@ tester.run("rousseau", rule, {
         "This is *pen*.",
         "This is **pen**.",
         "This is __pen__.",
+        "`this` is pen.",
         {
             text: "this is pen.",
             options: {
@@ -59,6 +60,28 @@ A number of pen.`,
                     column: 1
                 }
             ]
-        }
+        }, {
+            text: `There are a pen.
+A number of pen.`,
+            errors: [
+                {
+                    message: `suggestion(simplicity) "A number of" has a simpler alternative\nSuggestions:\n=> Many, some`,
+                    line: 2,
+                    column: 1
+                }
+            ]
+        },
+        {
+            text: "this is `pen`.`this is pen code`",
+            errors: [
+                {
+                    message: `error(sentence:uppercase) sentence should start with an uppercase letter
+Suggestions:
+=> This`,
+                    line: 1,
+                    column: 1
+                }
+            ]
+        },
     ]
 });