Fix #5, fix acme_ca_root in global options not being highlighted fully

caddyserver · Oct 13, 2020 · 26079b4 · 26079b4
1 parent 7db731e
commit 26079b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/examples/c.caddyfile b/examples/c.caddyfile
@@ -0,0 +1,3 @@
+example.localhost {
+	redir https://example.com/#/about 302
+}
diff --git a/syntaxes/caddyfile.tmLanguage.json b/syntaxes/caddyfile.tmLanguage.json
@@ -22,7 +22,11 @@
 			"patterns": [
 				{
 					"name": "comment.line.Caddyfile",
-					"match": "#.*"
+					"match": "\\s#.*"
+				},
+				{
+					"name": "comment.line.Caddyfile",
+					"match": "^#.*"
 				}
 			]
 		},
@@ -77,9 +81,9 @@
 		"domains": {
 			"patterns": [
 				{
-					"comment": "Domains",
+					"comment": "Domains and URLs",
 					"name": "keyword.control.caddyfile",
-					"match": "(https?:\/\/)*[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+(:[0-9]+)*"
+					"match": "(https?:\/\/)*[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+(:[0-9]+)*\\S*"
 				},
 				{
 					"comment": "localhost",
@@ -121,7 +125,7 @@
 					"patterns": [
 						{
 							"name": "support.constant.Caddyfile",
-							"match": "^\\s*(debug|https?_port|default_sni|order|experimental_http3|storage|acme_ca|acme_ca_root|email|admin|on_demand_tls|local_certs|key_type|auto_https)"
+							"match": "^\\s*(debug|https?_port|default_sni|order|experimental_http3|storage|acme_ca_root|acme_ca|email|admin|on_demand_tls|local_certs|key_type|auto_https)"
 						}
 					]
 				}