Fix bug where replacing went incorrectly

Author: wooorm

index.js

@@ -34,8 +34,9 @@ function findAndReplace(tree, find, replace, options) {
 
     return handler;
 
-    function handler(node, pos, parent) {
+    function handler(node, parent) {
       var siblings = parent.children;
+      var pos = siblings.indexOf(node);
       var value = node.value;
       var find = pair[0];
       var replace = pair[1];
@@ -102,12 +103,10 @@ function findAndReplace(tree, find, replace, options) {
         node = nodes[index];
 
         if (node.type === 'text') {
-          subhandler(node, pos, parent);
+          subhandler(node, parent);
         } else {
           search(node, settings, subhandler);
         }
-
-        pos++;
       }
     }
   }
@@ -124,16 +123,14 @@ function search(tree, options, handler) {
   function visitor(node, parents) {
     var length = parents.length;
     var index = length;
-    var parent;
 
     while (index--) {
       if (is(parents[index], ignore)) {
         return;
       }
     }
 
-    parent = parents[length - 1];
-    handler(node, parent.children.indexOf(node), parent);
+    handler(node, parents[length - 1]);
   }
 }
 

test.js

@@ -158,6 +158,47 @@ test('findAndReplace', function (t) {
     'should ignore from options'
   );
 
+  t.deepEqual(
+    findAndReplace(h('p', 'Some emphasis, importance, and code.'), {
+      importance: function (match) {
+        return h('strong', match);
+      },
+      code: function (match) {
+        return h('code', match);
+      },
+      emphasis: function (match) {
+        return h('em', match);
+      }
+    }),
+    create(),
+    'should not be order-sensitive with strings'
+  );
+
+  t.deepEqual(
+    findAndReplace(h('p', 'Some emphasis, importance, and code.'), [
+      [
+        /importance/g,
+        function (match) {
+          return h('strong', match);
+        }
+      ],
+      [
+        /code/g,
+        function (match) {
+          return h('code', match);
+        }
+      ],
+      [
+        /emphasis/g,
+        function (match) {
+          return h('em', match);
+        }
+      ]
+    ]),
+    create(),
+    'should not be order-sensitive with regexes'
+  );
+
   t.end();
 });