[markdown mode] improve setext behavior

Author: dwelle

mode/markdown/markdown.js

@@ -111,7 +111,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Blocks
 
   function blankLine(state) {
-    state.hr = false;
     // Reset linkTitle state
     state.linkTitle = false;
     // Reset EM state
@@ -141,11 +140,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     var firstTokenOnLine = stream.column() === state.indentation;
     var prevLineLineIsEmpty = lineIsEmpty(state.prevLine.stream);
     var prevLineIsIndentedCode = state.indentedCode;
-    var prevLineIsHr = state.hr;
+    var prevLineIsHr = state.prevLine.hr;
     var prevLineIsList = state.list !== false;
     var maxNonCodeIndentation = (state.listStack[state.listStack.length - 1] || 0) + 3;
 
-    state.hr = false;
     state.indentedCode = false;
 
     var lineIndentation = state.indentation;
@@ -172,6 +170,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    // not comprehensive (currently only for setext detection purposes)
+    var allowsInlineContinuation = (
+        !prevLineLineIsEmpty && !prevLineIsHr && !state.prevLine.header &&
+        (!prevLineIsList || !prevLineIsIndentedCode) &&
+        !state.prevLine.fencedCodeEnd
+    );
+
     var isHr = (state.list === false || prevLineIsHr || prevLineLineIsEmpty) &&
       state.indentation <= maxNonCodeIndentation && stream.match(hrRE);
 
@@ -195,7 +200,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
       return getType(state);
-    } else if (!isHr && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
+    } else if (!isHr && !state.setext && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
       var listType = match[1] ? "ol" : "ul";
 
       state.indentation = lineIndentation + stream.current().length;
@@ -227,8 +232,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // if setext set, indicates line after ---/===
       state.setext || (
         // line before ---/===
-        !state.quote && state.list === false && !state.code && !isHr &&
-        !prevLineIsList && !linkDefRE.test(stream.string) &&
+        (!allowsInlineContinuation || !prevLineIsList) && !state.quote && state.list === false &&
+        !state.code && !isHr && !linkDefRE.test(stream.string) &&
         (match = stream.lookAhead(1)) && (match = match.match(setextHeaderRE))
       )
     ) {
@@ -248,6 +253,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (isHr) {
       stream.skipToEnd();
       state.hr = true;
+      state.thisLine.hr = true;
       return tokenTypes.hr;
     } else if (stream.peek() === '[') {
       return switchInline(stream, state, footnoteLink);
@@ -796,9 +802,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // Reset state.formatting
       state.formatting = false;
 
-        // Reset state.header
       if (stream != state.thisLine.stream) {
         state.header = 0;
+        state.hr = false;
 
         if (stream.match(/^\s*$/, true)) {
           blankLine(state);

mode/markdown/test.js

@@ -327,12 +327,42 @@
 
   MT("noSetextAfterList",
      "[variable-2 - foo]",
-     "[hr ---]",
-     "",
+     "[hr ---]");
+
+  MT("noSetextAfterList_listContinuation",
      "[variable-2 - foo]",
      "bar",
      "[hr ---]");
 
+  MT("setextAfterList_afterIndentedCode",
+     "[variable-2 - foo]",
+     "",
+     "      [comment bar]",
+     "[header&header-2 baz]",
+     "[header&header-2 ---]");
+
+  MT("setextAfterList_afterFencedCodeBlocks",
+     "[variable-2 - foo]",
+     "",
+     "      [comment ```]",
+     "      [comment bar]",
+     "      [comment ```]",
+     "[header&header-2 baz]",
+     "[header&header-2 ---]");
+
+  MT("setextAfterList_afterHeader",
+     "[variable-2 - foo]",
+     "  [variable-2&header&header-1 # bar]",
+     "[header&header-2 baz]",
+     "[header&header-2 ---]");
+
+  MT("setextAfterList_afterHr",
+     "[variable-2 - foo]",
+     "",
+     "  [hr ---]",
+     "[header&header-2 bar]",
+     "[header&header-2 ---]");
+
   MT("setext_nestedInlineMarkup",
      "[header&header-1 foo ][em&header&header-1 *bar*]",
      "[header&header-1 =]");
@@ -348,6 +378,12 @@
      "[header&header-1 bar]",
      "[header&header-1 =]");
 
+  // ensure we don't regard space after dash as a list
+  MT("setext_emptyList",
+     "[header&header-2 foo]",
+     "[header&header-2 - ]",
+     "foo");
+
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",
      "[quote&quote-1 > foo]");