From c58fb71b5f6d70ef2a3652ca0794da29c45b46b5 Mon Sep 17 00:00:00 2001 From: Vova Kolobok Date: Fri, 12 Jul 2013 23:19:14 +0700 Subject: [PATCH 1/2] Remove fenced code support needed for better diff --- Markdown (Github Flavored).tmLanguage | 607 +------------------------- 1 file changed, 1 insertion(+), 606 deletions(-) diff --git a/Markdown (Github Flavored).tmLanguage b/Markdown (Github Flavored).tmLanguage index fdb4761..b562f72 100644 --- a/Markdown (Github Flavored).tmLanguage +++ b/Markdown (Github Flavored).tmLanguage @@ -88,610 +88,6 @@ - - begin - (```)\s*(html|html5)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - text.html.basic - - - - - - begin - (```)\s*(xml)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - text.xml - - - - - - begin - (```)\s*(diff)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.diff - - - - - - begin - (```)\s*(perl)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.perl - - - - - - begin - (```)\s*(php)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.php - - - - - - - begin - (```)\s*(css)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.css - - - - - - begin - (```)\s*(less)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.css.less - - - - - - begin - (```)\s*(java)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.java - - - - - - begin - (```)\s*(c)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.c - - - - - - - begin - (```)\s*(c\+\+)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.c++ - - - - - - begin - (```)\s*(yaml)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.yaml - - - - - - begin - (```)\s*(sql)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.sql - - - - - - begin - (```)\s*(shell)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.shell - - - - - - begin - (```)\s*(sass|scss)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.sass - - - - - - begin - (```)\s*(scala)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.scala - - - - - - begin - (```)\s*(objective-c)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.objc - - - - - - begin - (```)\s*(python)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.python - - - - - - begin - (```)\s*(coffee)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.coffee - - - - - - begin - (```)\s*(js|json|javascript)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.js - - - - - - begin - (```)\s*(ruby)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - patterns - - - include - source.ruby - - - - - - begin - (```)\s*(\w*)\s*$ - captures - - 1 - - name - punctuation.definition.fenced.markdown - - 2 - - name - variable.language.fenced.markdown - - - end - (\1)\n - name - markup.raw.block.markdown markup.raw.block.fenced.markdown - - begin ^[ ]{0,3}([*+-])(?=\s) @@ -1036,7 +432,7 @@ block_raw match - \G([ ]{4}|\t).*$\n? + ([ ]{4}|\t).*$\n? name markup.raw.block.markdown @@ -1702,7 +1098,6 @@ - include #inline From 95d009178761577347b6cca74d6f34bcee4eabea Mon Sep 17 00:00:00 2001 From: Vova Kolobok Date: Fri, 12 Jul 2013 23:22:37 +0700 Subject: [PATCH 2/2] Add fenced code add it into repository, so then it's included into inline --- Markdown (Github Flavored).tmLanguage | 686 ++++++++++++++++++++++++++ 1 file changed, 686 insertions(+) diff --git a/Markdown (Github Flavored).tmLanguage b/Markdown (Github Flavored).tmLanguage index b562f72..6b94d52 100644 --- a/Markdown (Github Flavored).tmLanguage +++ b/Markdown (Github Flavored).tmLanguage @@ -321,6 +321,608 @@ repository + fenced-html + + begin + (\s*```)\s*(html|html5)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + text.html.basic + + + + fenced-xml + + begin + (\s*```)\s*(xml)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + text.xml + + + + fenced-diff + + begin + (\s*```)\s*(diff)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.diff + + + + fenced-perl + + begin + (\s*```)\s*(perl)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.perl + + + + fenced-php + + begin + (\s*```)\s*(php)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.php + + + + fenced-css + + begin + (\s*```)\s*(css)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.css + + + + fenced-less + + begin + (\s*```)\s*(less)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.css.less + + + + fenced-java + + begin + (\s*```)\s*(java)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.java + + + + fenced-c + + begin + (\s*```)\s*(c)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.c + + + + fenced-c++ + + begin + (\s*```)\s*(c\+\+)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.c++ + + + + fenced-yaml + + begin + (\s*```)\s*(yaml)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.yaml + + + + fenced-sql + + begin + (\s*```)\s*(sql)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.sql + + + + fenced-shell + + begin + (\s*```)\s*(shell)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.shell + + + + fenced-sass + + begin + (\s*```)\s*(sass|scss)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.sass + + + + fenced-scala + + begin + (\s*```)\s*(scala)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.scala + + + + fenced-obj-c + + begin + (\s*```)\s*(objective-c)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.objc + + + + fenced-coffee + + begin + (\s*```)\s*(coffee)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.coffee + + + + fenced-js + + begin + (\s*```)\s*(js|json|javascript)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.js + + + + fenced-ruby + + begin + (\s*```)\s*(ruby)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.ruby + + + + fenced-python + + begin + (\s*```)\s*(python)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + patterns + + + include + source.python + + + + fenced-undefine + + begin + (\s*```)\s*(\w*)\s*$ + captures + + 1 + + name + punctuation.definition.fenced.markdown + + 2 + + name + variable.language.fenced.markdown + + + end + (\1)\n + name + markup.raw.block.markdown markup.raw.block.fenced.markdown + ampersand @@ -636,6 +1238,90 @@ patterns + + include + #fenced-html + + + include + #fenced-xml + + + include + #fenced-diff + + + include + #fenced-perl + + + include + #fenced-php + + + include + #fenced-css + + + include + #fenced-less + + + include + #fenced-java + + + include + #fenced-c + + + include + #fenced-c++ + + + include + #fenced-yaml + + + include + #fenced-sql + + + include + #fenced-shell + + + include + #fenced-sass + + + include + #fenced-scala + + + include + #fenced-obj-c + + + include + #fenced-coffee + + + include + #fenced-js + + + include + #fenced-ruby + + + include + #fenced-python + + + include + #fenced-undefine + include #escape