Merge from vscode merge-base (#22780)

* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"

This reverts commit 47a1745180.

* Fix notebook download task

* Remove done call from extensions-ci
This commit is contained in:
Karl Burtram
2023-04-19 21:48:46 -07:00
committed by GitHub
parent decbe8dded
commit e7d3d047ec
2389 changed files with 92155 additions and 42602 deletions

View File

@@ -33,7 +33,7 @@
"git": {
"name": "microsoft/vscode-markdown-tm-grammar",
"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
"commitHash": "b068fcb2fbfa834e695505bfb02bbcc0b4edab8b"
"commitHash": "69d3321b4923ca2d5e8e900018887cc38b5fe04a"
}
},
"license": "MIT",

View File

@@ -67,6 +67,7 @@
"meta.embedded.block.javascript": "javascript",
"meta.embedded.block.json": "json",
"meta.embedded.block.jsonc": "jsonc",
"meta.embedded.block.latex": "latex",
"meta.embedded.block.less": "less",
"meta.embedded.block.objc": "objc",
"meta.embedded.block.scss": "scss",
@@ -91,8 +92,8 @@
],
"configurationDefaults": {
"[markdown]": {
"editor.unicodeHighlight.ambiguousCharacters": false,
"editor.unicodeHighlight.invisibleCharacters": false
"editor.unicodeHighlight.ambiguousCharacters": false,
"editor.unicodeHighlight.invisibleCharacters": false
}
}
},

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/b068fcb2fbfa834e695505bfb02bbcc0b4edab8b",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/69d3321b4923ca2d5e8e900018887cc38b5fe04a",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
@@ -2774,47 +2774,50 @@
"5": {
"name": "punctuation.definition.metadata.markdown"
},
"6": {
"7": {
"name": "punctuation.definition.link.markdown"
},
"7": {
"8": {
"name": "markup.underline.link.markdown"
},
"9": {
"name": "punctuation.definition.link.markdown"
},
"10": {
"name": "string.other.link.description.title.markdown"
},
"11": {
"name": "punctuation.definition.string.begin.markdown"
"name": "markup.underline.link.markdown"
},
"12": {
"name": "punctuation.definition.string.end.markdown"
"name": "string.other.link.description.title.markdown"
},
"13": {
"name": "string.other.link.description.title.markdown"
"name": "punctuation.definition.string.begin.markdown"
},
"14": {
"name": "punctuation.definition.string.begin.markdown"
"name": "punctuation.definition.string.end.markdown"
},
"15": {
"name": "punctuation.definition.string.end.markdown"
},
"16": {
"name": "string.other.link.description.title.markdown"
},
"17": {
"16": {
"name": "punctuation.definition.string.begin.markdown"
},
"18": {
"17": {
"name": "punctuation.definition.string.end.markdown"
},
"18": {
"name": "string.other.link.description.title.markdown"
},
"19": {
"name": "punctuation.definition.string.begin.markdown"
},
"20": {
"name": "punctuation.definition.string.end.markdown"
},
"21": {
"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 double quotes…\n | ((').+?(')) # or in single 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]*\n (\n (<)([^<>\\n]*)(>)\n | ((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parens…\n | ((\")[^\"]*(\")) # or in double quotes…\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n",
"name": "meta.link.inline.markdown"
},
"link-ref": {
@@ -2838,7 +2841,7 @@
"name": "punctuation.definition.constant.end.markdown"
}
},
"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])",
"match": "(?<![\\]\\\\])(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])",
"name": "meta.link.reference.markdown"
},
"link-ref-literal": {
@@ -2859,7 +2862,7 @@
"name": "punctuation.definition.constant.end.markdown"
}
},
"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(\\])",
"match": "(?<![\\]\\\\])(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(\\])",
"name": "meta.link.reference.literal.markdown"
},
"link-ref-shortcut": {
@@ -2874,7 +2877,7 @@
"name": "punctuation.definition.link.title.end.markdown"
}
},
"match": "(\\[)(\\S+?)(\\])",
"match": "(?<![\\]\\\\])(\\[)(\\S+?)(\\])",
"name": "meta.link.reference.markdown"
},
"raw": {