Fix tab preventing paragraph continuation in lists

rlidwka · rlidwka · commit 1cd8a5143b22 · 2022-01-07T18:24:14.000+03:00
close #830
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [12.3.1] - WIP
+### Fixed
+- Fix corner case when tab prevents paragraph continuation in lists, #830.
+
+
 ## [12.3.0] - 2021-12-09
 ### Changed
 - `StateInline.delimiters[].jump` is removed.
@@ -583,6 +588,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Renamed presets folder (configs -> presets).
 
 
+[12.3.1]: https://github.com/markdown-it/markdown-it/compare/12.3.0...12.3.1
 [12.3.0]: https://github.com/markdown-it/markdown-it/compare/12.2.0...12.3.0
 [12.2.0]: https://github.com/markdown-it/markdown-it/compare/12.1.0...12.2.0
 [12.1.0]: https://github.com/markdown-it/markdown-it/compare/12.0.6...12.1.0
diff --git a/lib/rules_block/list.js b/lib/rules_block/list.js
@@ -152,7 +152,7 @@ module.exports = function list(state, startLine, endLine, silent) {
     // This code can fail if plugins use blkIndent as well as lists,
     // but I hope the spec gets fixed long before that happens.
     //
-    if (state.tShift[startLine] >= state.blkIndent) {
+    if (state.sCount[startLine] >= state.blkIndent) {
       isTerminatingParagraph = true;
     }
   }
diff --git a/test/fixtures/markdown-it/commonmark_extras.txt b/test/fixtures/markdown-it/commonmark_extras.txt
@@ -166,6 +166,27 @@ Regression test (code block + regular paragraph)
 </blockquote>
 .
 
+Regression test (tabs in lists, #830)
+.
+1. asd
+    2. asd
+
+---
+
+1. asd
+	2. asd
+.
+<ol>
+<li>asd
+2. asd</li>
+</ol>
+<hr>
+<ol>
+<li>asd
+2. asd</li>
+</ol>
+.
+
 Blockquotes inside indented lists should terminate correctly
 .
    - a

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ module.exports = function list(state, startLine, endLine, silent) {`
`152`	`152`	`// This code can fail if plugins use blkIndent as well as lists,`
`153`	`153`	`// but I hope the spec gets fixed long before that happens.`
`154`	`154`	`//`
`155`		`- if (state.tShift[startLine] >= state.blkIndent) {`
	`155`	`+ if (state.sCount[startLine] >= state.blkIndent) {`
`156`	`156`	`isTerminatingParagraph = true;`
`157`	`157`	`}`
`158`	`158`	`}`