Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into alex/tokenization

Browse Source
This commit is contained in:
Alex Dima
2017-01-05 12:31:43 +01:00
parent 68b8ad5a37 4496c87db5
commit ebc43b3e8b
200 changed files with 4313 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
extensions/markdown/test/colorize-results/test_md.json
View File

@@ -1584,8 +1584,19 @@
}
},
{
"c": "````application/json",
"t": "text.html.markdown meta.paragraph.markdown",
"c": "````",
"t": "text.html.markdown markup.fenced_code.block.markdown punctuation.definition.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "application/json",
"t": "text.html.markdown markup.fenced_code.block.markdown fenced_code.block.language",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1596,7 +1607,7 @@
},
{
"c": " { value: [\"or with a mime type\"] }",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1607,7 +1618,7 @@
},
{
"c": "````",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown punctuation.definition.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1838,7 +1849,7 @@
},
{
"c": "~~~",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown punctuation.definition.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1849,7 +1860,7 @@
},
{
"c": "// Markdown extra adds un-indented code blocks too",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1859,74 +1870,8 @@
}
},
{
"c": "if (this",
"t": "text.html.markdown meta.paragraph.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "_",
"t": "text.html.markdown meta.paragraph.markdown markup.italic.markdown punctuation.definition.italic.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "is",
"t": "text.html.markdown meta.paragraph.markdown markup.italic.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "_",
"t": "text.html.markdown meta.paragraph.markdown markup.italic.markdown punctuation.definition.italic.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "more_code == true ",
"t": "text.html.markdown meta.paragraph.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "&&",
"t": "text.html.markdown meta.paragraph.markdown meta.other.valid-ampersand.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": " !indented) {",
"t": "text.html.markdown meta.paragraph.markdown",
"c": "if (this_is_more_code == true && !indented) {",
"t": "text.html.markdown markup.fenced_code.block.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1937,7 +1882,7 @@
},
{
"c": " // tild wrapped code blocks, also not indented",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1948,7 +1893,7 @@
},
{
"c": "}",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@@ -1959,7 +1904,7 @@
},
{
"c": "~~~",
"t": "text.html.markdown meta.paragraph.markdown",
"t": "text.html.markdown markup.fenced_code.block.markdown punctuation.definition.markdown",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",