RubyGems - textpow1x - Versions diffs - 1.0.0 → 1.1.0 - Mend

textpow1x 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

data/.travis.yml +7 -0
data/Gemfile.lock +1 -1
data/MIT-LICENSE.txt +18 -0
data/README.rdoc +42 -169
data/Rakefile +22 -0
data/examples/benchmark_js.rb +11 -0
data/examples/jquery.js +9046 -0
data/lib/textpow/recording_processor.rb +13 -0
data/lib/textpow/syntax/broken/markdown.syntax +218 -242
data/lib/textpow/syntax.rb +89 -94
data/lib/textpow/version.rb +1 -1
data/lib/textpow.rb +1 -0
data/spec/fixtures/objeck.plist +107 -0
data/spec/textpow/score_manager_spec.rb +20 -0
data/spec/textpow/syntax_files_spec.rb +26 -0
data/spec/textpow/syntax_spec.rb +99 -0
data/spec/textpow_spec.rb +3 -30
metadata +13 -4

data/lib/textpow/recording_processor.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module Textpow
+  class RecordingProcessor
+    attr_accessor :stack
+    def initialize
+      @stack = []
+    end
+    def method_missing(name, *args)
+      @stack << [name, *args]
+    end
+  end
+end

data/lib/textpow/syntax/broken/markdown.syntax CHANGED Viewed

@@ -1,12 +1,51 @@
 ---
-name: Markdown
-fileTypes:
-- markdown
-- mdown
-- markdn
-- md
 scopeName: text.html.markdown
+name: Markdown
+keyEquivalent: ^~M
 repository:
+  link-email:
+    name: meta.link.email.lt-gt.markdown
+    captures:
+      "1":
+        name: punctuation.definition.link.markdown
+      "2":
+        name: markup.underline.link.markdown
+      "4":
+        name: punctuation.definition.link.markdown
+    match: (<)((?:mailto:)?[-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(>)
+  bracket:
+    name: meta.other.valid-bracket.markdown
+    comment: "\n\
+      \t\t\t\tMarkdown will convert this for us. We match it so that the\n\
+      \t\t\t\tHTML grammar will not mark it up as invalid.\n\
+      \t\t\t"
+    match: <(?![a-z/?\$!])
+  list-paragraph:
+    patterns:
+    - name: meta.paragraph.list.markdown
+      begin: \G\s+(?=\S)
+      end: ^\s*$
+      patterns:
+      - include: "#inline"
+      - comment: Match the list punctuation
+        captures:
+          "1":
+            name: punctuation.definition.list_item.markdown
+        match: ^\s*([*+-]|[0-9]+\.)
+  link-ref-literal:
+    name: meta.link.reference.literal.markdown
+    captures:
+      "6":
+        name: punctuation.definition.constant.end.markdown
+      "1":
+        name: punctuation.definition.string.begin.markdown
+      "2":
+        name: string.other.link.title.markdown
+      "4":
+        name: punctuation.definition.string.end.markdown
+      "5":
+        name: punctuation.definition.constant.begin.markdown
+    match: (\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)(\])
   image-inline:
     name: meta.image.inline.markdown
     captures:
@@ -55,63 +94,53 @@ repository:
       \t\t\t\t\t\\s*\t\t\t\t\t\t# Optional whitespace\n\
       \t\t\t\t(\\))\n\
       \t\t\t )"
-  image-ref:
-    name: meta.image.reference.markdown
+  link-inline:
+    name: meta.link.inline.markdown
     captures:
       "6":
-        name: constant.other.reference.link.markdown
-      "7":
-        name: punctuation.definition.constant.markdown
-      "1":
+        name: punctuation.definition.metadata.markdown
+      "11":
         name: punctuation.definition.string.begin.markdown
-      "2":
-        name: string.other.link.description.markdown
-      "4":
+      "7":
+        name: punctuation.definition.link.markdown
+      "12":
+        name: punctuation.definition.string.end.markdown
+      "8":
+        name: markup.underline.link.markdown
+      "13":
+        name: string.other.link.description.title.markdown
+      "9":
+        name: punctuation.definition.link.markdown
+      "14":
         name: punctuation.definition.string.begin.markdown
-      "5":
-        name: punctuation.definition.constant.markdown
-    match: \!(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)(.*?)(\])
-  escape:
-    name: constant.character.escape.markdown
-    match: \\[-`*_#+.!(){}\[\]\\>]
-  bracket:
-    name: meta.other.valid-bracket.markdown
-    match: <(?![a-z/?\$!])
-    comment: "\n\
-      \t\t\t\tMarkdown will convert this for us. We match it so that the\n\
-      \t\t\t\tHTML grammar will not mark it up as invalid.\n\
-      \t\t\t"
-  list-paragraph:
-    patterns:
-    - name: meta.paragraph.list.markdown
-      begin: \G\s+(?=\S)
-      end: ^\s*$
-      patterns:
-      - include: "#inline"
-  link-ref-literal:
-    name: meta.link.reference.literal.markdown
-    captures:
-      "6":
-        name: punctuation.definition.constant.end.markdown
+      "15":
+        name: punctuation.definition.string.end.markdown
+      "16":
+        name: punctuation.definition.metadata.markdown
       "1":
         name: punctuation.definition.string.begin.markdown
       "2":
         name: string.other.link.title.markdown
       "4":
         name: punctuation.definition.string.end.markdown
+      "10":
+        name: string.other.link.description.title.markdown
       "5":
-        name: punctuation.definition.constant.begin.markdown
-    match: (\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)(\])
-  link-email:
-    name: meta.link.email.lt-gt.markdown
-    captures:
-      "1":
-        name: punctuation.definition.link.markdown
-      "2":
-        name: markup.underline.link.markdown
-      "4":
-        name: punctuation.definition.link.markdown
-    match: (<)((?:mailto:)?[-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(>)
+        name: invalid.illegal.whitespace.markdown
+    match: "(?x:\n\
+      \t\t\t\t(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\t\n\
+      \t\t\t\t\t\t\t\t\t\t\t# Match the link text.\n\
+      \t\t\t\t([ ])?\t\t\t\t\t\t# Space not allowed\n\
+      \t\t\t\t(\\()\t\t\t\t\t\t# Opening paren for url\n\
+      \t\t\t\t\t(<?)(.*?)(>?)\t\t\t# The url\n\
+      \t\t\t\t\t[ \\t]*\t\t\t\t\t# Optional whitespace\n\
+      \t\t\t\t\t(?:\n\
+      \t\t\t\t\t\t  ((\\().+?(\\)))\t\t# Match title in parens\xE2\x80\xA6\n\
+      \t\t\t\t\t\t| ((\").+?(\"))\t\t# or in quotes.\n\
+      \t\t\t\t\t)?\t\t\t\t\t\t# Title is optional\n\
+      \t\t\t\t\t\\s*\t\t\t\t\t\t# Optional whitespace\n\
+      \t\t\t\t(\\))\n\
+      \t\t\t )"
   inline:
     patterns:
     - include: "#escape"
@@ -128,8 +157,32 @@ repository:
     - include: "#image-ref"
     - include: "#link-ref-literal"
     - include: "#link-ref"
+  image-ref:
+    name: meta.image.reference.markdown
+    captures:
+      "6":
+        name: constant.other.reference.link.markdown
+      "7":
+        name: punctuation.definition.constant.markdown
+      "1":
+        name: punctuation.definition.string.begin.markdown
+      "2":
+        name: string.other.link.description.markdown
+      "4":
+        name: punctuation.definition.string.begin.markdown
+      "5":
+        name: punctuation.definition.constant.markdown
+    match: \!(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)(.*?)(\])
+  escape:
+    name: constant.character.escape.markdown
+    match: \\[-`*_#+.!(){}\[\]\\>]
   block_quote:
     name: markup.quote.markdown
+    comment: "\n\
+      \t\t\t\tWe terminate the block quote when seeing an empty line, a\n\
+      \t\t\t\tseparator or a line with leading > characters. The latter is\n\
+      \t\t\t\tto \xE2\x80\x9Creset\xE2\x80\x9D the quote level for quoted lines.\n\
+      \t\t\t"
     begin: \G[ ]{,3}(>)(?!$)[ ]?
     beginCaptures:
       "1":
@@ -137,14 +190,13 @@ repository:
     end: |-
       (?x)^
       				(?=	\s*$
-      				|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\g<marker>){2,}[ \t]*+$
+      				|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$
       				|	[ ]{,3}>.
       				)
     patterns:
-    - begin: |-
-        (?x)\G
-        						(?=	[ ]{,3}>.
-        						)
+    - begin: !binary |
+        KD94KVxHCgkJCQkJCSg/PQlbIF17LDN9Pi4KCQkJCQkJKQ==
       end: ^
       patterns:
       - include: "#block_quote"
@@ -152,7 +204,7 @@ repository:
         (?x)\G
         						(?=	([ ]{4}|\t)
         						|	[#]{1,6}\s*+
-        						|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\g<marker>){2,}[ \t]*+$
+        						|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$
         						)
       applyEndPatternLast: 1
       end: ^
@@ -166,16 +218,11 @@ repository:
         						|	[ ]{,3}>.
         						|	([ ]{4}|\t)
         						|	[#]{1,6}\s*+
-        						|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\g<marker>){2,}[ \t]*+$
+        						|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$
         						)
       end: $|(?<=\n)
       patterns:
       - include: "#inline"
-    comment: "\n\
-      \t\t\t\tWe terminate the block quote when seeing an empty line, a\n\
-      \t\t\t\tseparator or a line with leading > characters. The latter is\n\
-      \t\t\t\tto \xE2\x80\x9Creset\xE2\x80\x9D the quote level for quoted lines.\n\
-      \t\t\t"
   link-ref:
     name: meta.link.reference.markdown
     captures:
@@ -195,102 +242,38 @@ repository:
   block_raw:
     name: markup.raw.block.markdown
     match: \G([ ]{4}|\t).*$\n?
-  separator:
-    name: meta.separator.markdown
-    match: \G[ ]{,3}([-*_])([ ]{,2}\1){2,}[ \t]*$\n?
-  link-inline:
-    name: meta.link.inline.markdown
-    captures:
-      "6":
-        name: punctuation.definition.metadata.markdown
-      "11":
-        name: punctuation.definition.string.begin.markdown
-      "7":
-        name: punctuation.definition.link.markdown
-      "12":
-        name: punctuation.definition.string.end.markdown
-      "8":
-        name: markup.underline.link.markdown
-      "13":
-        name: string.other.link.description.title.markdown
-      "9":
-        name: punctuation.definition.link.markdown
-      "14":
-        name: punctuation.definition.string.begin.markdown
-      "15":
-        name: punctuation.definition.string.end.markdown
-      "16":
-        name: punctuation.definition.metadata.markdown
-      "1":
-        name: punctuation.definition.string.begin.markdown
-      "2":
-        name: string.other.link.title.markdown
-      "4":
-        name: punctuation.definition.string.end.markdown
-      "10":
-        name: string.other.link.description.title.markdown
-      "5":
-        name: invalid.illegal.whitespace.markdown
-    match: "(?x:\n\
-      \t\t\t\t(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\t\n\
-      \t\t\t\t\t\t\t\t\t\t\t# Match the link text.\n\
-      \t\t\t\t([ ])?\t\t\t\t\t\t# Space not allowed\n\
-      \t\t\t\t(\\()\t\t\t\t\t\t# Opening paren for url\n\
-      \t\t\t\t\t(<?)(.*?)(>?)\t\t\t# The url\n\
-      \t\t\t\t\t[ \\t]*\t\t\t\t\t# Optional whitespace\n\
-      \t\t\t\t\t(?:\n\
-      \t\t\t\t\t\t  ((\\().+?(\\)))\t\t# Match title in parens\xE2\x80\xA6\n\
-      \t\t\t\t\t\t| ((\").+?(\"))\t\t# or in quotes.\n\
-      \t\t\t\t\t)?\t\t\t\t\t\t# Title is optional\n\
-      \t\t\t\t\t\\s*\t\t\t\t\t\t# Optional whitespace\n\
-      \t\t\t\t(\\))\n\
-      \t\t\t )"
   bold:
     name: markup.bold.markdown
+    begin: !binary |
+      KD94KQoJCQkJCQkoXCpcKnxfXykoPz1cUykJCQkJCQkJCSMgT3BlbgoJCQkJ
+      CQkoPz0KCQkJCQkJCSgKCQkJCQkJCSAgICA8W14+XSorPgkJCQkJCQkjIEhU
+      TUwgdGFncwoJCQkJCQkJICB8ICg/PHJhdz5gKykoW15gXXwoPyEoPzwhYClc
+      azxyYXc+KD8hYCkpYCkqK1xrPHJhdz4KCQkJCQkJCQkJCQkJCQkJCQkjIFJh
+      dwoJCQkJCQkJICB8IFxcW1xcYCpfe31cW1xdKCkjLiErXC0+XT8rCQkJIyBF
+      c2NhcGVzCgkJCQkJCQkgIHwgXFsKCQkJCQkJCQkoCQkJCQoJCQkJCQkJCSAg
+      ICAgICAgKD88c3F1YXJlPgkJCQkJIyBOYW1lZCBncm91cAoJCQkJCQkJCQkJ
+      CVteXFtcXVxcXQkJCQkjIE1hdGNoIG1vc3QgY2hhcnMKCQkJCQkJCQkgICAg
+      ICAgICAgfCBcXC4JCQkJCQkjIEVzY2FwZWQgY2hhcnMKCQkJCQkJCQkgICAg
+      ICAgICAgfCBcWyBcZzxzcXVhcmU+KisgXF0JCSMgTmVzdGVkIGJyYWNrZXRz
+      CgkJCQkJCQkJICAgICAgICApKisKCQkJCQkJCQkJXF0KCQkJCQkJCQkJKAoJ
+      CQkJCQkJCQkJKAkJCQkJCQkjIFJlZmVyZW5jZSBMaW5rCgkJCQkJCQkJCQkJ
+      WyBdPwkJCQkJIyBPcHRpb25hbCBzcGFjZQoJCQkJCQkJCQkJCVxbW15cXV0q
+      K1xdCQkJCSMgUmVmIG5hbWUKCQkJCQkJCQkJCSkKCQkJCQkJCQkJICB8ICgJ
+      CQkJCQkJIyBJbmxpbmUgTGluawoJCQkJCQkJCQkJCVwoCQkJCQkJIyBPcGVu
+      aW5nIHBhcmVuCgkJCQkJCQkJCQkJCVsgXHRdKisJCQkJIyBPcHRpb25hbCB3
+      aHRpZXNwYWNlCgkJCQkJCQkJCQkJCTw/KC4qPyk+PwkJCSMgVVJMCgkJCQkJ
+      CQkJCQkJCVsgXHRdKisJCQkJIyBPcHRpb25hbCB3aHRpZXNwYWNlCgkJCQkJ
+      CQkJCQkJCSgJCQkJCSMgT3B0aW9uYWwgVGl0bGUKCQkJCQkJCQkJCQkJCSg/
+      PHRpdGxlPlsnIl0pCgkJCQkJCQkJCQkJCQkoLio/KQoJCQkJCQkJCQkJCQkJ
+      XGs8dGl0bGU+CgkJCQkJCQkJCQkJCSk/CgkJCQkJCQkJCQkJXCkKCQkJCQkJ
+      CQkJCSkKCQkJCQkJCQkJKQoJCQkJCQkJCSkKCQkJCQkJCSAgfCAoPyEoPzw9
+      XFMpXDEpLgkJCQkJCSMgRXZlcnl0aGluZyBiZXNpZGVzCgkJCQkJCQkJCQkJ
+      CQkJCQkJIyBzdHlsZSBjbG9zZXIKCQkJCQkJCSkrKwoJCQkJCQkJKD88PVxT
+      KVwxCQkJCQkJCQkjIENsb3NlCgkJCQkJCSkKCQkJCQk=
     captures:
       "1":
         name: punctuation.definition.bold.markdown
-    begin: "(?x)\n\
-      \t\t\t\t\t\t(\\*\\*|__)(?=\\S)\t\t\t\t\t\t\t\t# Open\n\
-      \t\t\t\t\t\t(?=\n\
-      \t\t\t\t\t\t\t(\n\
-      \t\t\t\t\t\t\t    <[^>]*+>\t\t\t\t\t\t\t# HTML tags\n\
-      \t\t\t\t\t\t\t  | (?<raw>`+)([^`]|(?!(?<!`)\\g<raw>(?!`))`)*+\\g<raw>\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# Raw\n\
-      \t\t\t\t\t\t\t  | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+\t\t\t# Escapes\n\
-      \t\t\t\t\t\t\t  | \\[\n\
-      \t\t\t\t\t\t\t\t(\t\t\t\t\n\
-      \t\t\t\t\t\t\t\t        (?<square>\t\t\t\t\t# Named group\n\
-      \t\t\t\t\t\t\t\t\t\t\t[^\\[\\]\\\\]\t\t\t\t# Match most chars\n\
-      \t\t\t\t\t\t\t\t          | \\\\.\t\t\t\t\t\t# Escaped chars\n\
-      \t\t\t\t\t\t\t\t          | \\[ \\g<square>*+ \\]\t\t# Nested brackets\n\
-      \t\t\t\t\t\t\t\t        )*+\n\
-      \t\t\t\t\t\t\t\t\t\\]\n\
-      \t\t\t\t\t\t\t\t\t(\n\
-      \t\t\t\t\t\t\t\t\t\t(\t\t\t\t\t\t\t# Reference Link\n\
-      \t\t\t\t\t\t\t\t\t\t\t[ ]?\t\t\t\t\t# Optional space\n\
-      \t\t\t\t\t\t\t\t\t\t\t\\[[^\\]]*+\\]\t\t\t\t# Ref name\n\
-      \t\t\t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t\t\t  | (\t\t\t\t\t\t\t# Inline Link\n\
-      \t\t\t\t\t\t\t\t\t\t\t\\(\t\t\t\t\t\t# Opening paren\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t[ \\t]*+\t\t\t\t# Optional whtiespace\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t<?(.*?)>?\t\t\t# URL\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t[ \\t]*+\t\t\t\t# Optional whtiespace\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t(\t\t\t\t\t# Optional Title\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t(?<title>['\"])\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t(.*?)\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t\\g<title>\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t)?\n\
-      \t\t\t\t\t\t\t\t\t\t\t\\)\n\
-      \t\t\t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t  | (?!(?<=\\S)\\1).\t\t\t\t\t\t# Everything besides\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# style closer\n\
-      \t\t\t\t\t\t\t)++\n\
-      \t\t\t\t\t\t\t(?<=\\S)\\1\t\t\t\t\t\t\t\t# Close\n\
-      \t\t\t\t\t\t)\n\
-      \t\t\t\t\t"
     end: (?<=\S)(\1)
     patterns:
     - begin: (?=<[^>]*?>)
@@ -312,79 +295,50 @@ repository:
     - include: "#link-ref"
   heading:
     name: markup.heading.markdown
+    begin: \G(#{1,6})(?!#)\s*(?=\S)
     captures:
       "1":
         name: punctuation.definition.heading.markdown
-    begin: \G(#{1,6})(?!#)\s*(?=\S)
-    contentName: entity.name.section.markdown
     end: \s*(#*)$\n?
+    contentName: entity.name.section.markdown
     patterns:
     - include: "#inline"
-  link-inet:
-    name: meta.link.inet.markdown
-    captures:
-      "1":
-        name: punctuation.definition.link.markdown
-      "2":
-        name: markup.underline.link.markdown
-      "3":
-        name: punctuation.definition.link.markdown
-    match: (<)((?:https?|ftp)://.*?)(>)
-  raw:
-    name: markup.raw.inline.markdown
-    captures:
-      "1":
-        name: punctuation.definition.raw.markdown
-      "3":
-        name: punctuation.definition.raw.markdown
-    match: (`+)([^`]|(?!(?<!`)\1(?!`))`)*+(\1)
+  separator:
+    name: meta.separator.markdown
+    match: \G[ ]{,3}([-*_])([ ]{,2}\1){2,}[ \t]*$\n?
   italic:
     name: markup.italic.markdown
+    begin: !binary |
+      KD94KQoJCQkJCQkoXCp8XykoPz1cUykJCQkJCQkJCSMgT3BlbgoJCQkJCQko
+      Pz0KCQkJCQkJCSgKCQkJCQkJCSAgICA8W14+XSorPgkJCQkJCQkjIEhUTUwg
+      dGFncwoJCQkJCQkJICB8ICg/PHJhdz5gKykoW15gXXwoPyEoPzwhYClcazxy
+      YXc+KD8hYCkpYCkqK1xrPHJhdz4KCQkJCQkJCQkJCQkJCQkJCQkjIFJhdwoJ
+      CQkJCQkJICB8IFxcW1xcYCpfe31cW1xdKCkjLiErXC0+XT8rCQkJIyBFc2Nh
+      cGVzCgkJCQkJCQkgIHwgXFsKCQkJCQkJCQkoCQkJCQoJCQkJCQkJCSAgICAg
+      ICAgKD88c3F1YXJlPgkJCQkJIyBOYW1lZCBncm91cAoJCQkJCQkJCQkJCVte
+      XFtcXVxcXQkJCQkjIE1hdGNoIG1vc3QgY2hhcnMKCQkJCQkJCQkgICAgICAg
+      ICAgfCBcXC4JCQkJCQkjIEVzY2FwZWQgY2hhcnMKCQkJCQkJCQkgICAgICAg
+      ICAgfCBcWyBcZzxzcXVhcmU+KisgXF0JCSMgTmVzdGVkIGJyYWNrZXRzCgkJ
+      CQkJCQkJICAgICAgICApKisKCQkJCQkJCQkJXF0KCQkJCQkJCQkJKAoJCQkJ
+      CQkJCQkJKAkJCQkJCQkjIFJlZmVyZW5jZSBMaW5rCgkJCQkJCQkJCQkJWyBd
+      PwkJCQkJIyBPcHRpb25hbCBzcGFjZQoJCQkJCQkJCQkJCVxbW15cXV0qK1xd
+      CQkJCSMgUmVmIG5hbWUKCQkJCQkJCQkJCSkKCQkJCQkJCQkJICB8ICgJCQkJ
+      CQkJIyBJbmxpbmUgTGluawoJCQkJCQkJCQkJCVwoCQkJCQkJIyBPcGVuaW5n
+      IHBhcmVuCgkJCQkJCQkJCQkJCVsgXHRdKisJCQkJIyBPcHRpb25hbCB3aHRp
+      ZXNwYWNlCgkJCQkJCQkJCQkJCTw/KC4qPyk+PwkJCSMgVVJMCgkJCQkJCQkJ
+      CQkJCVsgXHRdKisJCQkJIyBPcHRpb25hbCB3aHRpZXNwYWNlCgkJCQkJCQkJ
+      CQkJCSgJCQkJCSMgT3B0aW9uYWwgVGl0bGUKCQkJCQkJCQkJCQkJCSg/PHRp
+      dGxlPlsnIl0pCgkJCQkJCQkJCQkJCQkoLio/KQoJCQkJCQkJCQkJCQkJXGs8
+      dGl0bGU+CgkJCQkJCQkJCQkJCSk/CgkJCQkJCQkJCQkJXCkKCQkJCQkJCQkJ
+      CSkKCQkJCQkJCQkJKQoJCQkJCQkJCSkKCQkJCQkJCSAgfCBcMVwxCQkJCQkJ
+      CQkjIE11c3QgYmUgYm9sZCBjbG9zZXIKCQkJCQkJCSAgfCAoPyEoPzw9XFMp
+      XDEpLgkJCQkJCSMgRXZlcnl0aGluZyBiZXNpZGVzCgkJCQkJCQkJCQkJCQkJ
+      CQkJIyBzdHlsZSBjbG9zZXIKCQkJCQkJCSkrKwoJCQkJCQkJKD88PVxTKVwx
+      CQkJCQkJCQkjIENsb3NlCgkJCQkJCSkKCQkJCQk=
     captures:
       "1":
         name: punctuation.definition.italic.markdown
-    begin: "(?x)\n\
-      \t\t\t\t\t\t(\\*|_)(?=\\S)\t\t\t\t\t\t\t\t# Open\n\
-      \t\t\t\t\t\t(?=\n\
-      \t\t\t\t\t\t\t(\n\
-      \t\t\t\t\t\t\t    <[^>]*+>\t\t\t\t\t\t\t# HTML tags\n\
-      \t\t\t\t\t\t\t  | (?<raw>`+)([^`]|(?!(?<!`)\\g<raw>(?!`))`)*+\\g<raw>\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# Raw\n\
-      \t\t\t\t\t\t\t  | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+\t\t\t# Escapes\n\
-      \t\t\t\t\t\t\t  | \\[\n\
-      \t\t\t\t\t\t\t\t(\t\t\t\t\n\
-      \t\t\t\t\t\t\t\t        (?<square>\t\t\t\t\t# Named group\n\
-      \t\t\t\t\t\t\t\t\t\t\t[^\\[\\]\\\\]\t\t\t\t# Match most chars\n\
-      \t\t\t\t\t\t\t\t          | \\\\.\t\t\t\t\t\t# Escaped chars\n\
-      \t\t\t\t\t\t\t\t          | \\[ \\g<square>*+ \\]\t\t# Nested brackets\n\
-      \t\t\t\t\t\t\t\t        )*+\n\
-      \t\t\t\t\t\t\t\t\t\\]\n\
-      \t\t\t\t\t\t\t\t\t(\n\
-      \t\t\t\t\t\t\t\t\t\t(\t\t\t\t\t\t\t# Reference Link\n\
-      \t\t\t\t\t\t\t\t\t\t\t[ ]?\t\t\t\t\t# Optional space\n\
-      \t\t\t\t\t\t\t\t\t\t\t\\[[^\\]]*+\\]\t\t\t\t# Ref name\n\
-      \t\t\t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t\t\t  | (\t\t\t\t\t\t\t# Inline Link\n\
-      \t\t\t\t\t\t\t\t\t\t\t\\(\t\t\t\t\t\t# Opening paren\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t[ \\t]*+\t\t\t\t# Optional whtiespace\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t<?(.*?)>?\t\t\t# URL\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t[ \\t]*+\t\t\t\t# Optional whtiespace\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t(\t\t\t\t\t# Optional Title\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t(?<title>['\"])\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t(.*?)\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t\\g<title>\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t)?\n\
-      \t\t\t\t\t\t\t\t\t\t\t\\)\n\
-      \t\t\t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t\t)\n\
-      \t\t\t\t\t\t\t  | \\1\\1\t\t\t\t\t\t\t\t# Must be bold closer\n\
-      \t\t\t\t\t\t\t  | (?!(?<=\\S)\\1).\t\t\t\t\t\t# Everything besides\n\
-      \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# style closer\n\
-      \t\t\t\t\t\t\t)++\n\
-      \t\t\t\t\t\t\t(?<=\\S)\\1\t\t\t\t\t\t\t\t# Close\n\
-      \t\t\t\t\t\t)\n\
-      \t\t\t\t\t"
     end: (?<=\S)(\1)((?!\1)|(?=\1\1))
     patterns:
     - begin: (?=<[^>]*?>)
@@ -404,79 +358,91 @@ repository:
     - include: "#image-ref"
     - include: "#link-ref-literal"
     - include: "#link-ref"
+  raw:
+    name: markup.raw.inline.markdown
+    captures:
+      "1":
+        name: punctuation.definition.raw.markdown
+      "3":
+        name: punctuation.definition.raw.markdown
+    match: (`+)([^`]|(?!(?<!`)\1(?!`))`)*+(\1)
+  link-inet:
+    name: meta.link.inet.markdown
+    captures:
+      "1":
+        name: punctuation.definition.link.markdown
+      "2":
+        name: markup.underline.link.markdown
+      "3":
+        name: punctuation.definition.link.markdown
+    match: (<)((?:https?|ftp)://.*?)(>)
   line-break:
     name: meta.dummy.line-break
     match: " {2,}$"
   ampersand:
     name: meta.other.valid-ampersand.markdown
-    match: "&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)"
     comment: "\n\
       \t\t\t\tMarkdown will convert this for us. We match it so that the\n\
       \t\t\t\tHTML grammar will not mark it up as invalid.\n\
       \t\t\t"
+    match: "&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)"
 uuid: 0A1D9874-B448-11D9-BD50-000D93B6E43C
-foldingStartMarker: |-
-  (?x)
-  		(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
-  		|<!--(?!.*-->)
-  		|\{\s*($|\?>\s*$|//|/\*(.*\*/\s*$|(?!.*?\*/)))
-  		)
 patterns:
 - name: meta.block-level.markdown
+  comment: "\n\
+    \t\t\t\tWe could also use an empty end match and set\n\
+    \t\t\t\tapplyEndPatternLast, but then we must be sure that the begin\n\
+    \t\t\t\tpattern will only match stuff matched by the sub-patterns.\n\
+    \t\t\t"
   begin: |-
     (?x)^
     				(?=	[ ]{,3}>.
-    				|	([ ]{4}|\t)
+    				|	([ ]{4}|\t)(?!$)
     				|	[#]{1,6}\s*+
-    				|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\g<marker>){2,}[ \t]*+$
+    				|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$
     				)
   end: |-
     (?x)^
     				(?!	[ ]{,3}>.
     				|	([ ]{4}|\t)
     				|	[#]{1,6}\s*+
-    				|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\g<marker>){2,}[ \t]*+$
+    				|	[ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$
     				)
   patterns:
   - include: "#block_quote"
   - include: "#block_raw"
   - include: "#heading"
   - include: "#separator"
-  comment: "\n\
-    \t\t\t\tWe could also use an empty end match and set\n\
-    \t\t\t\tapplyEndPatternLast, but then we must be sure that the begin\n\
-    \t\t\t\tpattern will only match stuff matched by the sub-patterns.\n\
-    \t\t\t"
-- name: markup.list.unnumbered
+- name: markup.list.unnumbered.markdown
+  begin: ^[ ]{0,3}([*+-])(?=\s)
   captures:
     "1":
       name: punctuation.definition.list_item.markdown
-  begin: ^[ ]{0,3}([*+-])(?=\s)
   end: ^(?=\S)
   patterns:
   - include: "#list-paragraph"
-- name: markup.list.numbered
+- name: markup.list.numbered.markdown
+  begin: ^[ ]{0,3}([0-9]+\.)(?=\s)
   captures:
     "1":
       name: punctuation.definition.list_item.markdown
-  begin: ^[ ]{0,3}[0-9]+(\.)(?=\s)
   end: ^(?=\S)
   patterns:
   - include: "#list-paragraph"
 - name: meta.disable-markdown
+  comment: "\n\
+    \t\t\t\tMarkdown formatting is disabled inside block-level tags.\n\
+    \t\t\t"
   begin: ^(?=<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b)(?!.*?</\1>)
   end: (?<=^</\1>$\n)
   patterns:
   - include: text.html.basic
-  comment: "\n\
-    \t\t\t\tMarkdown formatting is disabled inside block-level tags.\n\
-    \t\t\t"
 - name: meta.disable-markdown
+  comment: Same rule but for one line disables.
   begin: ^(?=<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b)
   end: $\n?
   patterns:
   - include: text.html.basic
-  comment: Same rule but for one line disables.
 - name: meta.link.reference.def.markdown
   captures:
     "6":
@@ -520,7 +486,7 @@ patterns:
     \t\t\t)"
 - name: meta.paragraph.markdown
   begin: ^(?=\S)(?![=-]{3,}(?=$))
-  end: ^(?:\s*$|(?=[ ]{,3}>.))|(?=[ \t]*\n)(?<=^===|^====|=====|^---|^----|-----)[ \t]*\n
+  end: ^(?:\s*$|(?=[ ]{,3}>.))|(?=[ \t]*\n)(?<=^===|^====|=====|^---|^----|-----)[ \t]*\n|(?=^#)
   patterns:
   - include: "#inline"
   - include: text.html.basic
@@ -534,10 +500,20 @@ patterns:
       "1":
         name: punctuation.definition.heading.markdown
     match: ^(-{3,})(?=[ \t]*$)
+foldingStartMarker: |-
+  (?x)
+  		(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
+  		|<!--(?!.*-->)
+  		|\{\s*($|\?>\s*$|//|/\*(.*\*/\s*$|(?!.*?\*/)))
+  		)
 foldingStopMarker: |-
   (?x)
   		(</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
   		|^\s*-->
   		|(^|\s)\}
   		)
-keyEquivalent: ^~M
+fileTypes:
+- mdown
+- markdown
+- markdn
+- md