markdown-it - npm Package Compare versions

Comparing version 8.3.1 to 8.3.2

CHANGELOG.md

@@ -0,1 +1,7 @@
+8.3.2 / 2017-08-03
+------------------
+
+- Fix blockquote termination inside lists, #386.
+
+
 8.3.1 / 2017-03-06
@@ -2,0 +8,0 @@ ------------------

lib/parser_block.js

@@ -18,3 +18,3 @@ /** internal
   [ 'fence',      require('./rules_block/fence'),      [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
-  [ 'blockquote', require('./rules_block/blockquote'), [ 'paragraph', 'reference', 'list' ] ],
+  [ 'blockquote', require('./rules_block/blockquote'), [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
   [ 'hr',         require('./rules_block/hr'),         [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
@@ -84,3 +84,3 @@ [ 'list',       require('./rules_block/list'),       [ 'paragraph', 'reference', 'blockquote' ] ],
 
-    // set state.tight iff we had an empty line before current tag
+    // set state.tight if we had an empty line before current tag
     // i.e. latest empty line should not count
@@ -87,0 +87,0 @@ state.tight = !hasEmptyLines;

lib/renderer.js

@@ -59,3 +59,3 @@ /**
 
-  // If language exists, inject class gently, without mudofying original token.
+  // If language exists, inject class gently, without modifying original token.
   // May be, one day we will add .clone() for token and simplify this part, but
@@ -62,0 +62,0 @@ // now we prefer to keep things local.

lib/rules_block/blockquote.js

@@ -13,3 +13,2 @@ // Block quotes
       initial,
-      isOutdented,
       l,
@@ -30,2 +29,3 @@ lastLineEmpty,
       token,
+      wasOutdented,
       oldLineMax = state.lineMax,
@@ -111,2 +111,3 @@ pos = state.bMarks[startLine] + state.tShift[startLine],
   state.parentType = 'blockquote';
+  wasOutdented = false;
 
@@ -140,3 +141,3 @@ // Search the end of the block
     // ```
-    isOutdented = state.sCount[nextLine] < state.blkIndent;
+    if (state.sCount[nextLine] < state.blkIndent) wasOutdented = true;
 
@@ -151,3 +152,3 @@ pos = state.bMarks[nextLine] + state.tShift[nextLine];
 
-    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !isOutdented) {
+    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !wasOutdented) {
       // This line is inside the blockquote.
@@ -252,4 +253,2 @@
 
-    if (isOutdented) break;
-
     oldBMarks.push(state.bMarks[nextLine]);
@@ -256,0 +255,0 @@ oldBSCount.push(state.bsCount[nextLine]);

lib/rules_block/list.js

@@ -8,3 +8,3 @@ // Lists
 
-// Search `[-+*][\n ]`, returns next pos arter marker on success
+// Search `[-+*][\n ]`, returns next pos after marker on success
 // or -1 on fail.
@@ -37,3 +37,3 @@ function skipBulletListMarker(state, startLine) {
 
-// Search `\d+[.)][\n ]`, returns next pos arter marker on success
+// Search `\d+[.)][\n ]`, returns next pos after marker on success
 // or -1 on fail.
@@ -215,8 +215,6 @@ function skipOrderedListMarker(state, startLine) {
 
-      if (isSpace(ch)) {
-        if (ch === 0x09) {
-          offset += 4 - (offset + state.bsCount[nextLine]) % 4;
-        } else {
-          offset++;
-        }
+      if (ch === 0x09) {
+        offset += 4 - (offset + state.bsCount[nextLine]) % 4;
+      } else if (ch === 0x20) {
+        offset++;
       } else {
@@ -322,3 +320,3 @@ break;
 
-  // Finilize list
+  // Finalize list
   if (isOrdered) {
@@ -325,0 +323,0 @@ token = state.push('ordered_list_close', 'ol', -1);

lib/rules_inline/escape.js

@@ -1,2 +0,2 @@
-// Proceess escaped chars and hardbreaks
+// Process escaped chars and hardbreaks
 
@@ -3,0 +3,0 @@ 'use strict';

package.json

 {
   "name": "markdown-it",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "description": "Markdown-it - modern pluggable markdown parser.",
@@ -61,4 +61,5 @@ "keywords": [
     "stylus": "~0.54.2",
-    "uglify-js": "^2.7.3"
+    "supertest": "^3.0.0",
+    "uglify-js": "^3.0.18"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

544921

decreased by-0.02%

Dev dependency count

27

increased by3.85%

Lines of code

11832

decreased by-0.07%

No dependency changes