diff --git a/extensions/markdown/syntaxes/gulpfile.js b/extensions/markdown/syntaxes/gulpfile.js index 15545e82502..6bd6851cb01 100644 --- a/extensions/markdown/syntaxes/gulpfile.js +++ b/extensions/markdown/syntaxes/gulpfile.js @@ -68,7 +68,7 @@ const fencedCodeBlockDefinition = (name, identifiers, sourceScope) => { return `fenced_code_block_${name} begin - (^|\\G)(\\s*)([\`~]{3,})\\s*((${identifiers.join('|')})(\\s+[^\`~]*)?$) + (^|\\G)(\\s*)(\`{3,}|~{3,})\\s*((${identifiers.join('|')})(\\s+[^\`~]*)?$) name markup.fenced_code.block.markdown end diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage b/extensions/markdown/syntaxes/markdown.tmLanguage index d9ac2a0ba6c..ede4f2a2d18 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage +++ b/extensions/markdown/syntaxes/markdown.tmLanguage @@ -588,7 +588,7 @@ fenced_code_block_css begin - (^|\G)(\s*)([`~]{3,})\s*((css|css.erb)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((css|css.erb)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -639,7 +639,7 @@ fenced_code_block_basic begin - (^|\G)(\s*)([`~]{3,})\s*((html|htm|shtml|xhtml|inc|tmpl|tpl)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((html|htm|shtml|xhtml|inc|tmpl|tpl)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -690,7 +690,7 @@ fenced_code_block_ini begin - (^|\G)(\s*)([`~]{3,})\s*((ini|conf)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((ini|conf)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -741,7 +741,7 @@ fenced_code_block_java begin - (^|\G)(\s*)([`~]{3,})\s*((java|bsh)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((java|bsh)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -792,7 +792,7 @@ fenced_code_block_lua begin - (^|\G)(\s*)([`~]{3,})\s*((lua)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((lua)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -843,7 +843,7 @@ fenced_code_block_makefile begin - (^|\G)(\s*)([`~]{3,})\s*((Makefile|makefile|GNUmakefile|OCamlMakefile)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((Makefile|makefile|GNUmakefile|OCamlMakefile)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -894,7 +894,7 @@ fenced_code_block_perl begin - (^|\G)(\s*)([`~]{3,})\s*((perl|pl|pm|pod|t|PL|psgi|vcl)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((perl|pl|pm|pod|t|PL|psgi|vcl)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -945,7 +945,7 @@ fenced_code_block_r begin - (^|\G)(\s*)([`~]{3,})\s*((R|r|s|S|Rprofile)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((R|r|s|S|Rprofile)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -996,7 +996,7 @@ fenced_code_block_ruby begin - (^|\G)(\s*)([`~]{3,})\s*((ruby|rb|rbx|rjs|Rakefile|rake|cgi|fcgi|gemspec|irbrc|Capfile|ru|prawn|Cheffile|Gemfile|Guardfile|Hobofile|Vagrantfile|Appraisals|Rantfile|Berksfile|Berksfile.lock|Thorfile|Puppetfile)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((ruby|rb|rbx|rjs|Rakefile|rake|cgi|fcgi|gemspec|irbrc|Capfile|ru|prawn|Cheffile|Gemfile|Guardfile|Hobofile|Vagrantfile|Appraisals|Rantfile|Berksfile|Berksfile.lock|Thorfile|Puppetfile)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1047,7 +1047,7 @@ fenced_code_block_php begin - (^|\G)(\s*)([`~]{3,})\s*((php|php3|php4|php5|phpt|phtml|aw|ctp)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((php|php3|php4|php5|phpt|phtml|aw|ctp)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1102,7 +1102,7 @@ fenced_code_block_sql begin - (^|\G)(\s*)([`~]{3,})\s*((sql|ddl|dml)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((sql|ddl|dml)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1153,7 +1153,7 @@ fenced_code_block_vs_net begin - (^|\G)(\s*)([`~]{3,})\s*((vb)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((vb)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1204,7 +1204,7 @@ fenced_code_block_xml begin - (^|\G)(\s*)([`~]{3,})\s*((xml|xsd|tld|jsp|pt|cpt|dtml|rss|opml)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((xml|xsd|tld|jsp|pt|cpt|dtml|rss|opml)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1255,7 +1255,7 @@ fenced_code_block_xsl begin - (^|\G)(\s*)([`~]{3,})\s*((xsl|xslt)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((xsl|xslt)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1306,7 +1306,7 @@ fenced_code_block_yaml begin - (^|\G)(\s*)([`~]{3,})\s*((yaml|yml)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((yaml|yml)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1357,7 +1357,7 @@ fenced_code_block_dosbatch begin - (^|\G)(\s*)([`~]{3,})\s*((bat|batch)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((bat|batch)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1408,7 +1408,7 @@ fenced_code_block_clojure begin - (^|\G)(\s*)([`~]{3,})\s*((clj|cljs|clojure)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((clj|cljs|clojure)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1459,7 +1459,7 @@ fenced_code_block_coffee begin - (^|\G)(\s*)([`~]{3,})\s*((coffee|Cakefile|coffee.erb)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((coffee|Cakefile|coffee.erb)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1510,7 +1510,7 @@ fenced_code_block_c begin - (^|\G)(\s*)([`~]{3,})\s*((c|h)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((c|h)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1561,7 +1561,7 @@ fenced_code_block_cpp begin - (^|\G)(\s*)([`~]{3,})\s*((cpp|c\+\+|cxx)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((cpp|c\+\+|cxx)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1612,7 +1612,7 @@ fenced_code_block_diff begin - (^|\G)(\s*)([`~]{3,})\s*((patch|diff|rej)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((patch|diff|rej)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1663,7 +1663,7 @@ fenced_code_block_dockerfile begin - (^|\G)(\s*)([`~]{3,})\s*((dockerfile|Dockerfile)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((dockerfile|Dockerfile)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1714,7 +1714,7 @@ fenced_code_block_git_commit begin - (^|\G)(\s*)([`~]{3,})\s*((COMMIT_EDITMSG|MERGE_MSG)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((COMMIT_EDITMSG|MERGE_MSG)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1765,7 +1765,7 @@ fenced_code_block_git_rebase begin - (^|\G)(\s*)([`~]{3,})\s*((git-rebase-todo)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((git-rebase-todo)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1816,7 +1816,7 @@ fenced_code_block_go begin - (^|\G)(\s*)([`~]{3,})\s*((go|golang)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((go|golang)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1867,7 +1867,7 @@ fenced_code_block_groovy begin - (^|\G)(\s*)([`~]{3,})\s*((groovy|gvy)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((groovy|gvy)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1918,7 +1918,7 @@ fenced_code_block_jade begin - (^|\G)(\s*)([`~]{3,})\s*((jade|pug)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((jade|pug)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -1969,7 +1969,7 @@ fenced_code_block_js begin - (^|\G)(\s*)([`~]{3,})\s*((js|jsx|javascript|es6|mjs)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((js|jsx|javascript|es6|mjs)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2020,7 +2020,7 @@ fenced_code_block_js_regexp begin - (^|\G)(\s*)([`~]{3,})\s*((regexp)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((regexp)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2071,7 +2071,7 @@ fenced_code_block_json begin - (^|\G)(\s*)([`~]{3,})\s*((json|sublime-settings|sublime-menu|sublime-keymap|sublime-mousemap|sublime-theme|sublime-build|sublime-project|sublime-completions)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((json|sublime-settings|sublime-menu|sublime-keymap|sublime-mousemap|sublime-theme|sublime-build|sublime-project|sublime-completions)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2122,7 +2122,7 @@ fenced_code_block_less begin - (^|\G)(\s*)([`~]{3,})\s*((less)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((less)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2173,7 +2173,7 @@ fenced_code_block_objc begin - (^|\G)(\s*)([`~]{3,})\s*((objectivec|objective-c|mm|objc|obj-c|m|h)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((objectivec|objective-c|mm|objc|obj-c|m|h)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2224,7 +2224,7 @@ fenced_code_block_scss begin - (^|\G)(\s*)([`~]{3,})\s*((scss)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((scss)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2275,7 +2275,7 @@ fenced_code_block_perl6 begin - (^|\G)(\s*)([`~]{3,})\s*((perl6|p6|pl6|pm6|nqp)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((perl6|p6|pl6|pm6|nqp)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2326,7 +2326,7 @@ fenced_code_block_powershell begin - (^|\G)(\s*)([`~]{3,})\s*((powershell|ps1|psm1|psd1)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((powershell|ps1|psm1|psd1)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2377,7 +2377,7 @@ fenced_code_block_python begin - (^|\G)(\s*)([`~]{3,})\s*((python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2428,7 +2428,7 @@ fenced_code_block_regexp_python begin - (^|\G)(\s*)([`~]{3,})\s*((re)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((re)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2479,7 +2479,7 @@ fenced_code_block_rust begin - (^|\G)(\s*)([`~]{3,})\s*((rust|rs)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((rust|rs)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2530,7 +2530,7 @@ fenced_code_block_scala begin - (^|\G)(\s*)([`~]{3,})\s*((scala|sbt)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((scala|sbt)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2581,7 +2581,7 @@ fenced_code_block_shell begin - (^|\G)(\s*)([`~]{3,})\s*((shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2632,7 +2632,7 @@ fenced_code_block_ts begin - (^|\G)(\s*)([`~]{3,})\s*((typescript|ts)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((typescript|ts)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2683,7 +2683,7 @@ fenced_code_block_tsx begin - (^|\G)(\s*)([`~]{3,})\s*((tsx)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((tsx)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2734,7 +2734,7 @@ fenced_code_block_csharp begin - (^|\G)(\s*)([`~]{3,})\s*((cs|csharp|c#)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((cs|csharp|c#)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2785,7 +2785,7 @@ fenced_code_block_fsharp begin - (^|\G)(\s*)([`~]{3,})\s*((fs|fsharp|f#)(\s+[^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*((fs|fsharp|f#)(\s+[^`~]*)?$) name markup.fenced_code.block.markdown end @@ -2838,7 +2838,7 @@ name markup.fenced_code.block.markdown begin - (^|\G)(\s*)([`~]{3,})\s*(?=([^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*(?=([^`~]*)?$) end (^|\G)(\2|\s{0,3})(\3)\s*$ beginCaptures diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage.base b/extensions/markdown/syntaxes/markdown.tmLanguage.base index 7c5a5558a18..4c48b6741fe 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage.base +++ b/extensions/markdown/syntaxes/markdown.tmLanguage.base @@ -416,7 +416,7 @@ name markup.fenced_code.block.markdown begin - (^|\G)(\s*)([`~]{3,})\s*(?=([^`~]*)?$) + (^|\G)(\s*)(`{3,}|~{3,})\s*(?=([^`~]*)?$) end (^|\G)(\2|\s{0,3})(\3)\s*$ beginCaptures