Update md grammar

mjbvz · mjbvz · commit bfda91410442 · 2019-08-19T19:48:50.000-07:00
Fixes #microsoft#79478
diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@@ -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/05ccfa3db6edbd357390431f9e316adb38ba41d8",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/d64818b45a51ad281d0eececa06fccb8c3767fe4",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -122,7 +122,7 @@
 					"contentName": "meta.embedded.block.html",
 					"patterns": [
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						}
 					]
 				}
@@ -386,7 +386,7 @@
 					"contentName": "meta.embedded.block.php",
 					"patterns": [
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						},
 						{
 							"include": "source.php"
@@ -1993,7 +1993,7 @@
 						"1": {
 							"patterns": [
 								{
-									"include": "text.html.basic"
+									"include": "text.html.derivative"
 								}
 							]
 						},
@@ -2015,18 +2015,18 @@
 							"begin": "(\\s*|$)",
 							"patterns": [
 								{
-									"include": "text.html.basic"
+									"include": "text.html.derivative"
 								}
 							],
 							"while": "(?i)^(?!.*</(script|style|pre)>)"
 						}
 					]
 				},
 				{
-					"begin": "(?i)(^|\\G)\\s*(?=</?(address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(\\s|$|/?>))",
+					"begin": "(?i)(^|\\G)\\s*(?=</?[a-zA-Z]+[^\\s/>]*(\\s|$|/?>))",
 					"patterns": [
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						}
 					],
 					"while": "^(?!\\s*$)"
@@ -2035,7 +2035,7 @@
 					"begin": "(^|\\G)\\s*(?=(<[a-zA-Z0-9\\-](/?>|\\s.*?>)|</[a-zA-Z0-9\\-]>)\\s*$)",
 					"patterns": [
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						}
 					],
 					"while": "^(?!\\s*$)"
@@ -2095,7 +2095,7 @@
 					"include": "#inline"
 				},
 				{
-					"include": "text.html.basic"
+					"include": "text.html.derivative"
 				},
 				{
 					"include": "#heading-setext"
@@ -2152,7 +2152,7 @@
 					"include": "#inline"
 				},
 				{
-					"include": "text.html.basic"
+					"include": "text.html.derivative"
 				},
 				{
 					"include": "#heading-setext"
@@ -2246,7 +2246,7 @@
 					"end": "(?<=>)",
 					"patterns": [
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						}
 					]
 				},
@@ -2391,7 +2391,7 @@
 					"end": "(?<=>)",
 					"patterns": [
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						}
 					]
 				},

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"If you want to provide a fix or improvement, please create a pull request against the original repository.",`
`5`	`5`	`"Once accepted there, we are happy to receive an update request."`
`6`	`6`	`],`
`7`		`- "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/05ccfa3db6edbd357390431f9e316adb38ba41d8",`
	`7`	`+ "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/d64818b45a51ad281d0eececa06fccb8c3767fe4",`
`8`	`8`	`"name": "Markdown",`
`9`	`9`	`"scopeName": "text.html.markdown",`
`10`	`10`	`"patterns": [`
`@@ -122,7 +122,7 @@`
`122`	`122`	`"contentName": "meta.embedded.block.html",`
`123`	`123`	`"patterns": [`
`124`	`124`	`{`
`125`		`- "include": "text.html.basic"`
	`125`	`+ "include": "text.html.derivative"`
`126`	`126`	`}`
`127`	`127`	`]`
`128`	`128`	`}`
`@@ -386,7 +386,7 @@`
`386`	`386`	`"contentName": "meta.embedded.block.php",`
`387`	`387`	`"patterns": [`
`388`	`388`	`{`
`389`		`- "include": "text.html.basic"`
	`389`	`+ "include": "text.html.derivative"`
`390`	`390`	`},`
`391`	`391`	`{`
`392`	`392`	`"include": "source.php"`
`@@ -1993,7 +1993,7 @@`
`1993`	`1993`	`"1": {`
`1994`	`1994`	`"patterns": [`
`1995`	`1995`	`{`
`1996`		`- "include": "text.html.basic"`
	`1996`	`+ "include": "text.html.derivative"`
`1997`	`1997`	`}`
`1998`	`1998`	`]`
`1999`	`1999`	`},`
`@@ -2015,18 +2015,18 @@`
`2015`	`2015`	`"begin": "(\\s*\|$)",`
`2016`	`2016`	`"patterns": [`
`2017`	`2017`	`{`
`2018`		`- "include": "text.html.basic"`
	`2018`	`+ "include": "text.html.derivative"`
`2019`	`2019`	`}`
`2020`	`2020`	`],`
`2021`	`2021`	`"while": "(?i)^(?!.*</(script\|style\|pre)>)"`
`2022`	`2022`	`}`
`2023`	`2023`	`]`
`2024`	`2024`	`},`
`2025`	`2025`	`{`
`2026`		`- "begin": "(?i)(^\|\\G)\\s*(?=</?(address\|article\|aside\|base\|basefont\|blockquote\|body\|caption\|center\|col\|colgroup\|dd\|details\|dialog\|dir\|div\|dl\|dt\|fieldset\|figcaption\|figure\|footer\|form\|frame\|frameset\|h1\|head\|header\|hr\|html\|iframe\|legend\|li\|link\|main\|menu\|menuitem\|meta\|nav\|noframes\|ol\|optgroup\|option\|p\|param\|section\|source\|summary\|table\|tbody\|td\|tfoot\|th\|thead\|title\|tr\|track\|ul)(\\s\|$\|/?>))",`
	`2026`	`+ "begin": "(?i)(^\|\\G)\\s(?=</?[a-zA-Z]+[^\\s/>](\\s\|$\|/?>))",`
`2027`	`2027`	`"patterns": [`
`2028`	`2028`	`{`
`2029`		`- "include": "text.html.basic"`
	`2029`	`+ "include": "text.html.derivative"`
`2030`	`2030`	`}`
`2031`	`2031`	`],`
`2032`	`2032`	`"while": "^(?!\\s*$)"`
`@@ -2035,7 +2035,7 @@`
`2035`	`2035`	`"begin": "(^\|\\G)\\s(?=(<[a-zA-Z0-9\\-](/?>\|\\s.?>)\|</[a-zA-Z0-9\\-]>)\\s*$)",`
`2036`	`2036`	`"patterns": [`
`2037`	`2037`	`{`
`2038`		`- "include": "text.html.basic"`
	`2038`	`+ "include": "text.html.derivative"`
`2039`	`2039`	`}`
`2040`	`2040`	`],`
`2041`	`2041`	`"while": "^(?!\\s*$)"`
`@@ -2095,7 +2095,7 @@`
`2095`	`2095`	`"include": "#inline"`
`2096`	`2096`	`},`
`2097`	`2097`	`{`
`2098`		`- "include": "text.html.basic"`
	`2098`	`+ "include": "text.html.derivative"`
`2099`	`2099`	`},`
`2100`	`2100`	`{`
`2101`	`2101`	`"include": "#heading-setext"`
`@@ -2152,7 +2152,7 @@`
`2152`	`2152`	`"include": "#inline"`
`2153`	`2153`	`},`
`2154`	`2154`	`{`
`2155`		`- "include": "text.html.basic"`
	`2155`	`+ "include": "text.html.derivative"`
`2156`	`2156`	`},`
`2157`	`2157`	`{`
`2158`	`2158`	`"include": "#heading-setext"`
`@@ -2246,7 +2246,7 @@`
`2246`	`2246`	`"end": "(?<=>)",`
`2247`	`2247`	`"patterns": [`
`2248`	`2248`	`{`
`2249`		`- "include": "text.html.basic"`
	`2249`	`+ "include": "text.html.derivative"`
`2250`	`2250`	`}`
`2251`	`2251`	`]`
`2252`	`2252`	`},`
`@@ -2391,7 +2391,7 @@`
`2391`	`2391`	`"end": "(?<=>)",`
`2392`	`2392`	`"patterns": [`
`2393`	`2393`	`{`
`2394`		`- "include": "text.html.basic"`
	`2394`	`+ "include": "text.html.derivative"`
`2395`	`2395`	`}`
`2396`	`2396`	`]`
`2397`	`2397`	`},`