Fixes #57593: Revert markdown grammar and markdown related theme changes to the previous stable version

This commit is contained in:
Alex Dima
2018-08-30 17:44:43 +02:00
parent 9d3307317e
commit d1a9e7f2b2
4 changed files with 102 additions and 206 deletions

View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/5f5b3d7eaced763432867f8eb6d3d768f6cd2acc",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/4504240cdb13a4640f64fc98a0adb858226a879e",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
@@ -165,9 +165,6 @@
{
"include": "#fenced_code_block_dart"
},
{
"include": "#fenced_code_block_handlebars"
},
{
"include": "#fenced_code_block_unknown"
},
@@ -189,7 +186,7 @@
"begin": "(^|\\G)[ ]{0,3}(>) ?",
"captures": {
"2": {
"name": "punctuation.definition.quote.begin.markdown"
"name": "beginning.punctuation.definition.quote.markdown"
}
},
"name": "markup.quote.markdown",
@@ -1688,39 +1685,6 @@
}
]
},
"fenced_code_block_handlebars": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(handlebars|hbs)(\\s+[^`~]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
},
"6": {
"name": "fenced_code.block.language.attributes"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.handlebars",
"patterns": [
{
"include": "text.html.handlebars"
}
]
}
]
},
"fenced_code_block_unknown": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?=([^`~]*)?$)",
"beginCaptures": {
@@ -1948,7 +1912,7 @@
"name": "punctuation.definition.string.end.markdown"
}
},
"match": "(?x)\n \\s* # Leading whitespace\n (\\[)([\\w ]+?)(\\])(:) # Reference name\n [ \\t]* # Optional whitespace\n (<?)(\\S+?)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in quotes…\n | ((\").+?(\")) # or in parens.\n )? # Title is optional\n \\s* # Optional whitespace\n $\n",
"match": "(?x)\n \\s* # Leading whitespace\n (\\[)(.+?)(\\])(:) # Reference name\n [ \\t]* # Optional whitespace\n (<?)(\\S+?)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in quotes…\n | ((\").+?(\")) # or in parens.\n )? # Title is optional\n \\s* # Optional whitespace\n $\n",
"name": "meta.link.reference.def.markdown"
},
"list_paragraph": {
@@ -1970,10 +1934,10 @@
"lists": {
"patterns": [
{
"begin": "(^|\\G)([ ]{0,3})([*+-])([ \\t])",
"begin": "(^|\\G)([ ]{0,3})([*+-])([ ]{1,3}|\\t)",
"beginCaptures": {
"3": {
"name": "punctuation.definition.list.begin.markdown"
"name": "beginning.punctuation.definition.list.markdown"
}
},
"comment": "Currently does not support un-indented second lines.",
@@ -1986,13 +1950,13 @@
"include": "#list_paragraph"
}
],
"while": "((^|\\G)([ ]{2,4}|\\t))|(^[ \\t]*$)"
"while": "((^|\\G)([ ]{4}|\\t))|(^[ \\t]*$)"
},
{
"begin": "(^|\\G)([ ]{0,3})([0-9]+\\.)([ \\t])",
"begin": "(^|\\G)([ ]{0,3})([0-9]+\\.)([ ]{1,3}|\\t)",
"beginCaptures": {
"3": {
"name": "punctuation.definition.list.begin.markdown"
"name": "beginning.punctuation.definition.list.markdown"
}
},
"name": "markup.list.numbered.markdown",
@@ -2004,7 +1968,7 @@
"include": "#list_paragraph"
}
],
"while": "((^|\\G)([ ]{2,4}|\\t))|(^[ \\t]*$)"
"while": "((^|\\G)([ ]{4}|\\t))|(^[ \\t]*$)"
}
]
},
@@ -2030,7 +1994,7 @@
"while": "(^|\\G)([ ]{4}|\\t)"
},
"separator": {
"match": "(^|\\G)[ ]{0,3}([*-_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
"match": "(^|\\G)[ ]{0,3}([\\*\\-\\_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
"name": "meta.separator.markdown"
}
}
@@ -2085,9 +2049,6 @@
},
{
"include": "#link-ref-literal"
},
{
"include": "#link-ref-shortcut"
}
],
"repository": {
@@ -2097,7 +2058,7 @@
"name": "meta.other.valid-ampersand.markdown"
},
"bold": {
"begin": "(?x)\n (\\*\\*(?=\\w)|(?<!\\w)\\*\\*|(?<!\\w)\\b__)(?=\\S) # Open\n (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whitespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whitespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | (?!(?<=\\S)\\1). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=__\\b|\\*\\*)\\1 # Close\n )\n",
"begin": "(?x)\n ((?<!\\w)\\*\\*\\b|\\b__)(?=\\S) # Open\n (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whitespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whitespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | (?!(?<=\\S)\\1). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=__\\b|\\*\\*)\\1 # Close\n )\n",
"captures": {
"1": {
"name": "punctuation.definition.bold.markdown"
@@ -2154,9 +2115,6 @@
},
{
"include": "#link-ref"
},
{
"include": "#link-ref-shortcut"
}
]
},
@@ -2242,7 +2200,7 @@
"name": "meta.image.reference.markdown"
},
"italic": {
"begin": "(?x) (\\*(?=\\w)|(?<!\\w)\\*|(?<!\\w)\\b_)(?=\\S) # Open\n (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whtiespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whtiespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | \\1\\1 # Must be bold closer\n | (?!(?<=\\S)\\1). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=_\\b|\\*)\\1 # Close\n )\n",
"begin": "(?x) (\\*\\b|\\b_)(?=\\S) # Open\n (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whtiespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whtiespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | \\1\\1 # Must be bold closer\n | (?!(?<=\\S)\\1). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=_\\b|\\*)\\1 # Close\n )\n",
"captures": {
"1": {
"name": "punctuation.definition.italic.markdown"
@@ -2296,9 +2254,6 @@
},
{
"include": "#link-ref"
},
{
"include": "#link-ref-shortcut"
}
]
},
@@ -2352,32 +2307,32 @@
"7": {
"name": "markup.underline.link.markdown"
},
"9": {
"8": {
"name": "punctuation.definition.link.markdown"
},
"10": {
"9": {
"name": "string.other.link.description.title.markdown"
},
"10": {
"name": "punctuation.definition.string.begin.markdown"
},
"11": {
"name": "punctuation.definition.string.begin.markdown"
"name": "punctuation.definition.string.end.markdown"
},
"12": {
"name": "punctuation.definition.string.end.markdown"
},
"13": {
"name": "string.other.link.description.title.markdown"
},
"14": {
"13": {
"name": "punctuation.definition.string.begin.markdown"
},
"15": {
"14": {
"name": "punctuation.definition.string.end.markdown"
},
"16": {
"15": {
"name": "punctuation.definition.metadata.markdown"
}
},
"match": "(?x)\n (\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n (<?)((?<url>[^\\s()]+|\\(\\g<url>*\\))*)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parens…\n | ((\").+?(\")) # or in quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n",
"match": "(?x)\n (\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n (<?)(.*?)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parens…\n | ((\").+?(\")) # or in quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n",
"name": "meta.link.inline.markdown"
},
"link-ref": {
@@ -2425,21 +2380,6 @@
"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(\\])",
"name": "meta.link.reference.literal.markdown"
},
"link-ref-shortcut": {
"captures": {
"1": {
"name": "punctuation.definition.string.begin.markdown"
},
"2": {
"name": "string.other.link.title.markdown"
},
"4": {
"name": "punctuation.definition.string.end.markdown"
}
},
"match": "(\\[)(\\S+?)(\\])",
"name": "meta.link.reference.markdown"
},
"raw": {
"captures": {
"1": {