Fix MD007/ul-indent to use parent indent instead of previous indent (fixes #106).

lib/md005.js

@@ -10,9 +10,8 @@ module.exports = {
   "tags": [ "bullet", "ul", "indentation" ],
   "function": function MD005(params, onError) {
     shared.flattenLists().forEach(function forList(list) {
-      var indent = shared.indentFor(list.items[0]);
       list.items.forEach(function forItem(item) {
-        shared.addErrorDetailIf(onError, item.lineNumber, indent,
+        shared.addErrorDetailIf(onError, item.lineNumber, list.indent,
           shared.indentFor(item), null,
           shared.rangeFromRegExp(item.line, shared.listItemMarkerRe));
       });

lib/md006.js

@@ -13,7 +13,7 @@ module.exports = {
     shared.flattenLists().forEach(function forList(list) {
       if (list.unordered && !list.nesting) {
         shared.addErrorDetailIf(onError, list.open.lineNumber,
-          0, shared.indentFor(list.open), null,
+          0, list.indent, null,
           shared.rangeFromRegExp(list.open.line, shared.listItemMarkerRe));
       }
     });

lib/md007.js

@@ -10,16 +10,11 @@ module.exports = {
   "tags": [ "bullet", "ul", "indentation" ],
   "function": function MD007(params, onError) {
     var optionsIndent = params.config.indent || 2;
-    var prevIndent = 0;
     shared.flattenLists().forEach(function forList(list) {
-      if (list.unordered && list.parentsUnordered) {
+      if (list.unordered && list.parentsUnordered && list.indent) {
-        var indent = shared.indentFor(list.open);
+        shared.addErrorDetailIf(onError, list.open.lineNumber,
-        if (indent > prevIndent) {
+          list.parentIndent + optionsIndent, list.indent, null,
-          shared.addErrorDetailIf(onError, list.open.lineNumber,
+          shared.rangeFromRegExp(list.open.line, shared.listItemMarkerRe));
-            prevIndent + optionsIndent, indent, null,
-            shared.rangeFromRegExp(list.open.line, shared.listItemMarkerRe));
-        }
-        prevIndent = indent;
       }
     });
   }

lib/shared.js

@@ -99,10 +99,11 @@ module.exports.escapeForRegExp = function escapeForRegExp(str) {
 };
 
 // Returns the indent for a token
-module.exports.indentFor = function indentFor(token) {
+function indentFor(token) {
   var line = token.line.replace(/^[\s>]*(> |>)/, "");
   return line.length - trimLeft(line).length;
-};
+}
+module.exports.indentFor = indentFor;
 
 // Returns the heading style for a heading token
 module.exports.headingStyleFor = function headingStyleFor(token) {
@@ -180,6 +181,8 @@ function makeTokenCache(params) {
         "parentsUnordered": !current ||
           (current.unordered && current.parentsUnordered),
         "open": token,
+        "indent": indentFor(token),
+        "parentIndent": (current && current.indent) || 0,
         "items": [],
         "nesting": stack.length - 1,
         "lastLineIndex": -1,

test/inconsistent_bullet_indent_same_level.md

@@ -1,4 +1,4 @@
 * Item
     * Item {MD007}
   * Item {MD005}
-    * Item
+    * Item {MD007}

test/list-indentation.md

@@ -0,0 +1,46 @@
+# list-indentation
+
+Text
+
+- Item
+    - Item {MD007}
+- Item
+    - Item {MD007}
+
+Text
+
+- Item
+  - Item
+- Item
+    - Item {MD007}
+
+Text
+
+- Item
+    - Item {MD007}
+- Item
+  - Item
+
+Text
+
+- Item
+  - Item
+   - Item {MD005}
+  - Item
+   - Item {MD005}
+   - Item {MD005}
+  - Item
+- Item
+  - Item
+   - Item {MD005}
+  - Item
+- Item
+   - Item {MD007}
+   - Item
+   - Item
+- Item
+   - Item {MD007}
+   - Item
+  - Item {MD005}
+
+Text