Update markdown grammar

Pulls in new header scopes for #47113
2025-12-24 20:26:08 +00:00 · 2018-04-09 12:45:59 -07:00
parent a786ed344e
commit 2cbe56f39d
3 changed files with 135 additions and 90 deletions
--- 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/6e1063a71d4d017f976ccbe3d68138f4662c9a66",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/641c88a57c3f33ef8bcb504202f8330acef39b9e",
 	"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": [
 						{
--- a/extensions/markdown-basics/test/colorize-results/test-33886_md.json
+++ b/extensions/markdown-basics/test/colorize-results/test-33886_md.json
@@ -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",
--- a/extensions/markdown-basics/test/colorize-results/test_md.json
+++ b/extensions/markdown-basics/test/colorize-results/test_md.json
@@ -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",