motion-markdown-it 12.0.6 → 12.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ae9a8bfdbc637f5e2127d34919298661b7d4f32b55830053a0c30012cd1ddf
-  data.tar.gz: 5787ec92937c5e8ef19fead547c0fae14b0de4507c0098cb5e8a79720dab611e
+  metadata.gz: c31536746654ba78827fdf56f400de64e4b70bb1e459c7bbd610febaaf1074b3
+  data.tar.gz: 80e94ade9943fe02ce4c3b153ff002ddbaca3239d632f3cce74e4724182b7527
 SHA512:
-  metadata.gz: 72214978791be3e608c627bfa80db56a1ca30df9650a1df85bef0c2a99fb68b822a1464261595779f16385a9e69cf9898fbd15966ba5e00ad969d4a0568c028a
-  data.tar.gz: 5e2ede784f3386d45b930789abb2c0a05ee8bc2dffb707d736c437e48fe722b9084dc75f2032bea6a8d47b723d0daac43428fb059e1ac1f7c6fa92dfad4a83e7
+  metadata.gz: 0f2566c0fcae8a7ee85f0c7be95440429c643dbc3e7d1d7b94b67bb5deeedbabb4553c81ba566db87087b5c058516420b0a9c45e29b85467baaa5875a7476fab
+  data.tar.gz: 89fe0c6e543efb1eb11f0186e346fbe31f2e714745ee8272ca75e953e1a6fb7796e19754d97fcc67d5b0d3e01fc8731a8a46a03ea8eaacb598e3e690a7720c27

data/README.md

@@ -7,7 +7,7 @@ Ruby/RubyMotion version of Markdown-it (CommonMark compliant and extendable)
 
 This gem is a port of the [markdown-it Javascript package](https://github.com/markdown-it/markdown-it) by Vitaly Puzrin and Alex Kocharin. 
 
-_Currently synced with markdown-it 12.0.6_
+_Currently synced with markdown-it 12.3.2_
 
 ---
 
@@ -185,7 +185,7 @@ var md = require('markdown-it')({
   highlight: function (str, lang) {
     if (lang && hljs.getLanguage(lang)) {
       try {
-        return hljs.highlight(lang, str).value;
+        return hljs.highlight(str, { language: lang }).value;
       } catch (__) {}
     }
 
@@ -205,7 +205,7 @@ var md = require('markdown-it')({
     if (lang && hljs.getLanguage(lang)) {
       try {
         return '<pre class="hljs"><code>' +
-               hljs.highlight(lang, str, true).value +
+               hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
                '</code></pre>';
       } catch (__) {}
     }

data/lib/motion-markdown-it/index.rb

@@ -190,7 +190,7 @@ module MarkdownIt
     #   highlight: function (str, lang) {
     #     if (lang && hljs.getLanguage(lang)) {
     #       try {
-    #         return hljs.highlight(lang, str, true).value;
+    #         return hljs.highlight(str, { language: lang, ignoreIllegals: true }).value;
     #       } catch (__) {}
     #     }
     #
@@ -210,7 +210,7 @@ module MarkdownIt
     #     if (lang && hljs.getLanguage(lang)) {
     #       try {
     #         return '<pre class="hljs"><code>' +
-    #                hljs.highlight(lang, str, true).value +
+    #                hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
     #                '</code></pre>';
     #       } catch (__) {}
     #     }

data/lib/motion-markdown-it/renderer.rb

@@ -245,7 +245,7 @@ module MarkdownIt
 
 
     # Renderer.renderInline(tokens, options, env) -> String
-    # - tokens (Array): list on block tokens to renter
+    # - tokens (Array): list on block tokens to render
     # - options (Object): params of parser instance
     # - env (Object): additional data from parsed input (references, for example)
     #
@@ -271,7 +271,7 @@ module MarkdownIt
 
     # internal
     # Renderer.renderInlineAsText(tokens, options, env) -> String
-    # - tokens (Array): list on block tokens to renter
+    # - tokens (Array): list on block tokens to render
     # - options (Object): params of parser instance
     # - env (Object): additional data from parsed input (references, for example)
     #
@@ -297,7 +297,7 @@ module MarkdownIt
 
 
     # Renderer.render(tokens, options, env) -> String
-    # - tokens (Array): list on block tokens to renter
+    # - tokens (Array): list on block tokens to render
     # - options (Object): params of parser instance
     # - env (Object): additional data from parsed input (references, for example)
     #

data/lib/motion-markdown-it/rules_block/code.rb

@@ -26,7 +26,7 @@ module MarkdownIt
         state.line    = last
 
         token         = state.push('code_block', 'code', 0)
-        token.content = state.getLines(startLine, last, 4 + state.blkIndent, true)
+        token.content = state.getLines(startLine, last, 4 + state.blkIndent, false) + "\n"
         token.map     = [ startLine, state.line ]
         return true
       end

data/lib/motion-markdown-it/rules_block/html_block.rb

@@ -11,7 +11,7 @@ module MarkdownIt
       # last argument defines whether it can terminate a paragraph or not
       #
       HTML_SEQUENCES = [
-        [ /^<(script|pre|style)(?=(\s|>|$))/i, /<\/(script|pre|style)>/i, true ],
+        [ /^<(script|pre|style|textarea)(?=(\s|>|$))/i, /<\/(script|pre|style|textarea)>/i, true ],
         [ /^<!--/,        /-->/,   true ],
         [ /^<\?/,         /\?>/,   true ],
         [ /^<![A-Z]/,     />/,     true ],

data/lib/motion-markdown-it/rules_block/list.rb

@@ -129,7 +129,7 @@ module MarkdownIt
           # 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
           end
         end
@@ -138,7 +138,7 @@ module MarkdownIt
         if ((posAfterMarker = skipOrderedListMarker(state, startLine)) >= 0)
           isOrdered   = true
           start       = state.bMarks[startLine] + state.tShift[startLine]
-          markerValue = state.src[start, posAfterMarker - start - 1].to_i
+          markerValue = state.src[start, posAfterMarker - 1].to_i
 
           # If we're starting a new ordered list right after
           # a paragraph, it should start with 1.
@@ -231,6 +231,9 @@ module MarkdownIt
           token        = state.push('list_item_open', 'li', 1)
           token.markup = markerCharCode.chr
           token.map    = itemLines = [ startLine, 0 ]
+          if (isOrdered)
+            token.info = state.src.slice(start...posAfterMarker - 1)
+          end
 
           # change current state, then restore it after parser subcall
           oldTight                = state.tight
@@ -307,6 +310,7 @@ module MarkdownIt
           if (isOrdered)
             posAfterMarker = skipOrderedListMarker(state, nextLine)
             break if (posAfterMarker < 0)
+            start = state.bMarks[nextLine] + state.tShift[nextLine]
           else
             posAfterMarker = skipBulletListMarker(state, nextLine)
             break if (posAfterMarker < 0)

data/lib/motion-markdown-it/rules_inline/balance_pairs.rb

@@ -9,9 +9,28 @@ module MarkdownIt
         openersBottom = {}
         max = delimiters.length
         
+        return if (!max)
+      
+        # headerIdx is the first delimiter of the current (where closer is) delimiter run
+        headerIdx = 0
+        lastTokenIdx = -2 # needs any value lower than -1
+        jumps = []
+
         0.upto(max - 1) do |closerIdx|
           closer = delimiters[closerIdx]
       
+          jumps.push(0)
+      
+          # markers belong to same delimiter run if:
+          #  - they have adjacent tokens
+          #  - AND markers are the same
+          #
+          if (delimiters[headerIdx][:marker] != closer[:marker] || lastTokenIdx != closer[:token] - 1)
+            headerIdx = closerIdx
+          end
+      
+          lastTokenIdx = closer[:token]
+      
           # Length is only used for emphasis-specific "rule of 3",
           # if it's not defined (in strikethrough or 3rd party plugins),
           # we can default it to 0 to disable those checks.
@@ -21,24 +40,23 @@ module MarkdownIt
           next if (!closer[:close])
       
           # Previously calculated lower bounds (previous fails)
-          # for each marker and each delimiter length modulo 3.
+          # for each marker, each delimiter length modulo 3,
+          # and for whether this closer can be an opener;
+          # https://github.com/commonmark/cmark/commit/34250e12ccebdc6372b8b49c44fab57c72443460
           unless openersBottom[closer[:marker]]
-            openersBottom[closer[:marker]] = [ -1, -1, -1 ]
+            openersBottom[closer[:marker]] = [ -1, -1, -1, -1, -1, -1 ]
           end
       
-          minOpenerIdx = openersBottom[closer[:marker]][closer[:length] % 3]
+          minOpenerIdx = openersBottom[closer[:marker]][(closer[:open] ? 3 : 0) + (closer[:length] % 3)]
       
-          openerIdx = closerIdx - closer[:jump] - 1
-
-          # avoid crash if `closer.jump` is pointing outside of the array, see #742
-          openerIdx = -1 if (openerIdx < -1)
+          openerIdx = headerIdx - jumps[headerIdx] - 1
 
           newMinOpenerIdx = openerIdx
 
           while openerIdx > minOpenerIdx
             opener = delimiters[openerIdx]
       
-            (openerIdx -= opener[:jump] + 1) && next if (opener[:marker] != closer[:marker])
+            (openerIdx -= jumps[openerIdx] + 1) && next if (opener[:marker] != closer[:marker])
       
             if (opener[:open] && opener[:end] < 0)
       
@@ -65,19 +83,23 @@ module MarkdownIt
                 # sure algorithm has linear complexity (see *_*_*_*_*_... case).
                 #
                 lastJump = openerIdx > 0 && !delimiters[openerIdx - 1][:open] ?
-                  delimiters[openerIdx - 1][:jump] + 1 : 0
+                  jumps[openerIdx - 1] + 1 : 0
       
-                closer[:jump]  = closerIdx - openerIdx + lastJump
+                jumps[closerIdx] = closerIdx - openerIdx + lastJump
+                jumps[openerIdx] = lastJump
+                
                 closer[:open]  = false
                 opener[:end]   = closerIdx
-                opener[:jump]  = lastJump
                 opener[:close] = false
                 newMinOpenerIdx = -1
+                # treat next token as start of run,
+                # it optimizes skips in **<...>**a**<...>** pathological case
+                lastTokenIdx = -2
                 break
               end
             end
             
-            openerIdx -= opener[:jump] + 1
+            openerIdx -= jumps[openerIdx] + 1
           end
       
           if (newMinOpenerIdx != -1)
@@ -88,7 +110,7 @@ module MarkdownIt
             # See details here:
             # https://github.com/commonmark/cmark/issues/178#issuecomment-270417442
             #
-            openersBottom[closer[:marker]][(closer[:length] || 0) % 3] = newMinOpenerIdx
+            openersBottom[closer[:marker]][(closer[:open] ? 3 : 0) + ((closer[:length] || 0) % 3)] = newMinOpenerIdx
           end
         end
       end

data/lib/motion-markdown-it/rules_inline/emphasis.rb

@@ -30,15 +30,6 @@ module MarkdownIt
             #
             length: scanned[:length],
 
-            # An amount of characters before this one that's equivalent to
-            # current one. In plain English: if this delimiter does not open
-            # an emphasis, neither do previous `jump` characters.
-            #
-            # Used to skip sequences like "*****" in one step, for 1st asterisk
-            # value will be 0, for 2nd it's 1 and so on.
-            #
-            jump:   i,
-
             # A position of the token this delimiter corresponds to.
             #
             token:  state.tokens.length - 1,
@@ -82,9 +73,11 @@ module MarkdownIt
           #
           isStrong = i > 0 &&
                      delimiters[i - 1][:end] == startDelim[:end] + 1 &&
+                     # check that first two markers match and adjacent
+                     delimiters[i - 1][:marker] == startDelim[:marker] &&
                      delimiters[i - 1][:token] == startDelim[:token] - 1 &&
-                     delimiters[startDelim[:end] + 1][:token] == endDelim[:token] + 1 &&
-                     delimiters[i - 1][:marker] == startDelim[:marker]
+                     # check that last two markers are adjacent (we can safely assume they match)
+                     delimiters[startDelim[:end] + 1][:token] == endDelim[:token] + 1
 
           ch = fromCodePoint(startDelim[:marker])
 

data/lib/motion-markdown-it/rules_inline/newline.rb

@@ -20,7 +20,13 @@ module MarkdownIt
         if !silent
           if pmax >= 0 && charCodeAt(state.pending, pmax) == 0x20
             if pmax >= 1 && charCodeAt(state.pending, pmax - 1) == 0x20
-              state.pending = state.pending.sub(/ +$/, '')
+              # Find whitespaces tail of pending chars.
+              ws = pmax - 1
+              while (ws >= 1 && charCodeAt(state.pending, ws - 1) == 0x20)
+                ws -= 1
+              end
+
+              state.pending = state.pending.slice(0...ws)
               state.push('hardbreak', 'br', 0)
             else
               state.pending = state.pending.slice(0...-1)

data/lib/motion-markdown-it/rules_inline/strikethrough.rb

@@ -35,7 +35,6 @@ module MarkdownIt
           state.delimiters.push({
             marker: marker,
             length: 0,     # disable "rule of 3" length checks meant for emphasis
-            jump:   i / 2, # for `~~` 1 marker = 2 characters
             token:  state.tokens.length - 1,
             end:    -1,
             open:   scanned[:can_open],

data/lib/motion-markdown-it/token.rb

@@ -67,6 +67,7 @@ module MarkdownIt
        # *
        # * - Info string for "fence" tokens
        # * - The value "auto" for autolink "link_open" and "link_close" tokens
+       # * - The string value of the item marker for ordered-list "list_item_open" tokens
       @info     = ''
 
        # * Token#meta -> Object

data/lib/motion-markdown-it/version.rb

@@ -1,3 +1,3 @@
 module MotionMarkdownIt
-  VERSION = '12.0.6'
+  VERSION = '12.3.2'
 end

data/spec/motion-markdown-it/misc_spec.rb

@@ -195,6 +195,9 @@ describe 'Misc' do
 
     expect(md.render('123')).to eq "<p>123</p>\n"
     expect(md.render("123\n")).to eq "<p>123</p>\n"
+
+    expect(md.render('    codeblock')).to eq "<pre><code>codeblock\n</code></pre>\n"
+    expect(md.render("    codeblock\n")).to eq "<pre><code>codeblock\n</code></pre>\n"
   end
 
   #------------------------------------------------------------------------------
@@ -371,6 +374,42 @@ describe 'smartquotes' do
   end
 end
 
+describe 'Ordered list info' do
+  md = MarkdownIt::Parser.new
+
+  def type_filter(tokens, type)
+    return tokens.select { |t| t.type === type }
+  end
+
+  it 'Should mark ordered list item tokens with info' do
+    tokens = md.parse("1. Foo\n2. Bar\n20. Fuzz", {})
+    expect(type_filter(tokens, 'ordered_list_open').length).to eq 1
+
+    tokens = type_filter(tokens, 'list_item_open')
+    expect(tokens.length).to eq 3
+    expect(tokens[0].info).to eq '1'
+    expect(tokens[0].markup).to eq '.'
+    expect(tokens[1].info).to eq '2'
+    expect(tokens[1].markup).to eq '.'
+    expect(tokens[2].info).to eq '20'
+    expect(tokens[2].markup).to eq '.'
+
+    tokens = md.parse(" 1. Foo\n2. Bar\n  20. Fuzz\n 199. Flp", {})
+    expect(type_filter(tokens, 'ordered_list_open').length).to eq 1
+
+    tokens = type_filter(tokens, 'list_item_open')
+    expect(tokens.length).to eq 4
+    expect(tokens[0].info).to eq '1'
+    expect(tokens[0].markup).to eq '.'
+    expect(tokens[1].info).to eq '2'
+    expect(tokens[1].markup).to eq '.'
+    expect(tokens[2].info).to eq '20'
+    expect(tokens[2].markup).to eq '.'
+    expect(tokens[3].info).to eq '199'
+    expect(tokens[3].markup).to eq '.'
+  end
+end
+
 #------------------------------------------------------------------------------
 describe 'Token attributes' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 12.0.6
+  version: 12.3.2
 platform: ruby
 authors:
 - Brett Walker