ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 10:38:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/markdown-basics/package.json
View File

@@ -7,9 +7,6 @@
"engines": {
"vscode": "^1.20.0"
},
"categories": [
"Languages"
],
"contributes": {
"languages": [
{

103
extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
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/07f55fa7c0dcdbfeb21b8970255e96dd9c00b6bb",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/e667795f83c83e36dc6f90bde14632a963c52e34",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
@@ -1668,14 +1668,103 @@
"name": "markup.fenced_code.block.markdown"
},
"heading": {
"begin": "(?:^|\\G)[ ]{0,3}(#{1,6})\\s*(?=[\\S[^#]])",
"match": "(?:^|\\G)[ ]{0,3}((#{1,6})\\s*(?=[\\S[^#]]).*?\\s*(#{1,6})?)$\\n?",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
"patterns": [
{
"match": "(#{6})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
"name": "heading.6.markdown",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
},
"2": {
"name": "entity.name.section.markdown"
},
"3": {
"name": "punctuation.definition.heading.markdown"
}
}
},
{
"match": "(#{5})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
"name": "heading.5.markdown",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
},
"2": {
"name": "entity.name.section.markdown"
},
"3": {
"name": "punctuation.definition.heading.markdown"
}
}
},
{
"match": "(#{4})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
"name": "heading.4.markdown",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
},
"2": {
"name": "entity.name.section.markdown"
},
"3": {
"name": "punctuation.definition.heading.markdown"
}
}
},
{
"match": "(#{3})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
"name": "heading.3.markdown",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
},
"2": {
"name": "entity.name.section.markdown"
},
"3": {
"name": "punctuation.definition.heading.markdown"
}
}
},
{
"match": "(#{2})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
"name": "heading.2.markdown",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
},
"2": {
"name": "entity.name.section.markdown"
},
"3": {
"name": "punctuation.definition.heading.markdown"
}
}
},
{
"match": "(#{1})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
"name": "heading.1.markdown",
"captures": {
"1": {
"name": "punctuation.definition.heading.markdown"
},
"2": {
"name": "entity.name.section.markdown"
},
"3": {
"name": "punctuation.definition.heading.markdown"
}
}
}
]
}
},
"contentName": "entity.name.section.markdown",
"end": "\\s*(#{1,6})?$\\n?",
"name": "markup.heading.markdown",
"patterns": [
{
@@ -1933,7 +2022,7 @@
"name": "meta.other.valid-ampersand.markdown"
},
"bold": {
"begin": "(?x)\n (\\*\\*|__)(?=\\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)\\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"
@@ -2075,7 +2164,7 @@
"name": "meta.image.reference.markdown"
},
"italic": {
"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)\\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"

18
extensions/markdown-basics/test/colorize-results/test-33886_md.json
View File

@@ -1,7 +1,7 @@
[
{
"c": "#",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -12,7 +12,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -23,7 +23,7 @@
},
{
"c": "h",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -177,7 +177,7 @@
},
{
"c": "#",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -188,7 +188,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -199,7 +199,7 @@
},
{
"c": "h",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -298,7 +298,7 @@
},
{
"c": "#",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -309,7 +309,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -320,7 +320,7 @@
},
{
"c": "h",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",

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

@@ -1,7 +1,7 @@
[
{
"c": "#",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -12,7 +12,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -23,7 +23,7 @@
},
{
"c": "Header 1",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -33,19 +33,8 @@
}
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
"dark_vs": "markup.heading: #569CD6",
"light_vs": "markup.heading: #800000",
"hc_black": "markup.heading: #6796E6"
}
},
{
"c": "#",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"c": " #",
"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -56,7 +45,7 @@
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -67,7 +56,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -78,7 +67,7 @@
},
{
"c": "Header 2",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -88,19 +77,8 @@
}
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
"dark_vs": "markup.heading: #569CD6",
"light_vs": "markup.heading: #800000",
"hc_black": "markup.heading: #6796E6"
}
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"c": " ##",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -111,7 +89,7 @@
},
{
"c": "###",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -122,7 +100,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -133,7 +111,7 @@
},
{
"c": "Header 3 ### (Hashes on right are optional)",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -144,7 +122,7 @@
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -155,7 +133,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -166,7 +144,7 @@
},
{
"c": "Markdown plus h2 with a custom ID ## {#id-goes-here}",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -243,7 +221,7 @@
},
{
"c": "###",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -254,7 +232,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -265,7 +243,7 @@
},
{
"c": "Alternate heading styles:",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2025,7 +2003,7 @@
},
{
"c": "###",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2036,7 +2014,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2047,7 +2025,7 @@
},
{
"c": "Horizontal rules",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.3.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2201,7 +2179,7 @@
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2212,7 +2190,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2223,7 +2201,7 @@
},
{
"c": "Markdown plus tables",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2233,19 +2211,8 @@
}
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
"dark_vs": "markup.heading: #569CD6",
"light_vs": "markup.heading: #800000",
"hc_black": "markup.heading: #6796E6"
}
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"c": " ##",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2366,7 +2333,7 @@
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2377,7 +2344,7 @@
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2388,7 +2355,7 @@
},
{
"c": "Markdown plus definition lists",
"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
@@ -2398,19 +2365,8 @@
}
},
{
"c": " ",
"t": "text.html.markdown markup.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",
"dark_vs": "markup.heading: #569CD6",
"light_vs": "markup.heading: #800000",
"hc_black": "markup.heading: #6796E6"
}
},
{
"c": "##",
"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
"c": " ##",
"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
"r": {
"dark_plus": "markup.heading: #569CD6",
"light_plus": "markup.heading: #800000",