Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 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/eb3898715b50d7911377a650e383a768a3a21f25",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/00b05ebe6850083664d92d0eba6e5ee8f153baa6",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
@@ -70,11 +70,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -103,11 +103,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -136,11 +136,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -169,11 +169,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -202,11 +202,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -235,11 +235,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -268,11 +268,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -294,18 +294,18 @@
]
},
"fenced_code_block_r": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(R|r|s|S|Rprofile)(\\s+[^`~]*)?$)",
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(R|r|s|S|Rprofile|\\{\\.r.+?\\})(\\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"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -334,11 +334,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -367,11 +367,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -403,11 +403,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -436,11 +436,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -469,11 +469,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -502,11 +502,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -535,11 +535,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -568,11 +568,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -601,11 +601,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -634,11 +634,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -667,11 +667,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -700,11 +700,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -716,7 +716,7 @@
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.cpp",
"contentName": "meta.embedded.block.cpp source.cpp",
"patterns": [
{
"include": "source.cpp"
@@ -733,11 +733,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -766,11 +766,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -799,11 +799,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -832,11 +832,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -865,11 +865,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -898,11 +898,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -931,11 +931,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -957,18 +957,18 @@
]
},
"fenced_code_block_js": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs)(\\s+[^`~]*)?$)",
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|\\{\\.js.+?\\})(\\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"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -997,11 +997,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1030,11 +1030,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1063,11 +1063,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1096,11 +1096,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1129,11 +1129,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1162,11 +1162,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1195,11 +1195,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1228,11 +1228,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1261,11 +1261,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1287,18 +1287,18 @@
]
},
"fenced_code_block_python": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi)(\\s+[^`~]*)?$)",
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi|\\{\\.python.+?\\})(\\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"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1327,11 +1327,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1353,18 +1353,18 @@
]
},
"fenced_code_block_rust": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(rust|rs)(\\s+[^`~]*)?$)",
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(rust|rs|\\{\\.rust.+?\\})(\\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"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1393,11 +1393,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1419,18 +1419,18 @@
]
},
"fenced_code_block_shell": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init)(\\s+[^`~]*)?$)",
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init|\\{\\.bash.+?\\})(\\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"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1459,11 +1459,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1492,11 +1492,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1525,11 +1525,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1558,11 +1558,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1591,11 +1591,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1624,11 +1624,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
@@ -1657,11 +1657,11 @@
"3": {
"name": "punctuation.definition.markdown"
},
"5": {
"name": "fenced_code.block.language"
"4": {
"name": "fenced_code.block.language.markdown"
},
"6": {
"name": "fenced_code.block.language.attributes"
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {