Update log grammar

alexr00 · alexr00 · commit ad720d6a631c · 2020-07-16T10:15:58.000+02:00
Fixes microsoft#102598
diff --git a/extensions/log/cgmanifest.json b/extensions/log/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "vscode-logfile-highlighter",
 					"repositoryUrl": "https://github.com/emilast/vscode-logfile-highlighter",
-					"commitHash": "fbe9797ea7889ee55def6da8dee86ba625ca9759"
+					"commitHash": "5dcab1c304110b605041824cde3810c6ef305477"
 				}
 			},
 			"license": "MIT",
-			"version": "2.6.0"
+			"version": "2.8.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.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/emilast/vscode-logfile-highlighter/commit/fbe9797ea7889ee55def6da8dee86ba625ca9759",
+	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/5dcab1c304110b605041824cde3810c6ef305477",
 	"name": "Log file",
 	"scopeName": "text.log",
 	"patterns": [
@@ -17,7 +17,7 @@
 			"name": "comment log.verbose"
 		},
 		{
-			"match": "\\bV/",
+			"match": "(?<=^[\\s\\d\\p]*)\\bV\\b",
 			"name": "comment log.verbose"
 		},
 		{
@@ -29,7 +29,7 @@
 			"name": "markup.changed log.debug"
 		},
 		{
-			"match": "\\bD/",
+			"match": "(?<=^[\\s\\d\\p]*)\\bD\\b",
 			"name": "markup.changed log.debug"
 		},
 		{
@@ -41,7 +41,7 @@
 			"name": "markup.inserted log.info"
 		},
 		{
-			"match": "\\bI/",
+			"match": "(?<=^[\\s\\d\\p]*)\\bI\\b",
 			"name": "markup.inserted log.info"
 		},
 		{
@@ -53,7 +53,7 @@
 			"name": "markup.deleted log.warning"
 		},
 		{
-			"match": "\\bW/",
+			"match": "(?<=^[\\s\\d\\p]*)\\bW\\b",
 			"name": "markup.deleted log.warning"
 		},
 		{
@@ -65,7 +65,7 @@
 			"name": "string.regexp, strong log.error"
 		},
 		{
-			"match": "\\bE/",
+			"match": "(?<=^[\\s\\d\\p]*)\\bE\\b",
 			"name": "string.regexp, strong log.error"
 		},
 		{
@@ -88,6 +88,10 @@
 			"match": "[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}",
 			"name": "constant.language log.constant"
 		},
+		{
+			"match": "([0-9a-fA-F]+[:-])+[0-9a-fA-F]+",
+			"name": "constant.language log.constant"
+		},
 		{
 			"match": "\\b([0-9]+|true|false|null)\\b",
 			"name": "constant.language log.constant"

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`"git": {`
`7`	`7`	`"name": "vscode-logfile-highlighter",`
`8`	`8`	`"repositoryUrl": "https://github.com/emilast/vscode-logfile-highlighter",`
`9`		`- "commitHash": "fbe9797ea7889ee55def6da8dee86ba625ca9759"`
	`9`	`+ "commitHash": "5dcab1c304110b605041824cde3810c6ef305477"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"license": "MIT",`
`13`		`- "version": "2.6.0"`
	`13`	`+ "version": "2.8.0"`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`	`"version": 1`
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/emilast/vscode-logfile-highlighter/commit/fbe9797ea7889ee55def6da8dee86ba625ca9759",`
	`7`	`+ "version": "https://github.com/emilast/vscode-logfile-highlighter/commit/5dcab1c304110b605041824cde3810c6ef305477",`
`8`	`8`	`"name": "Log file",`
`9`	`9`	`"scopeName": "text.log",`
`10`	`10`	`"patterns": [`
`@@ -17,7 +17,7 @@`
`17`	`17`	`"name": "comment log.verbose"`
`18`	`18`	`},`
`19`	`19`	`{`
`20`		`- "match": "\\bV/",`
	`20`	`+ "match": "(?<=^[\\s\\d\\p]*)\\bV\\b",`
`21`	`21`	`"name": "comment log.verbose"`
`22`	`22`	`},`
`23`	`23`	`{`
`@@ -29,7 +29,7 @@`
`29`	`29`	`"name": "markup.changed log.debug"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "match": "\\bD/",`
	`32`	`+ "match": "(?<=^[\\s\\d\\p]*)\\bD\\b",`
`33`	`33`	`"name": "markup.changed log.debug"`
`34`	`34`	`},`
`35`	`35`	`{`
`@@ -41,7 +41,7 @@`
`41`	`41`	`"name": "markup.inserted log.info"`
`42`	`42`	`},`
`43`	`43`	`{`
`44`		`- "match": "\\bI/",`
	`44`	`+ "match": "(?<=^[\\s\\d\\p]*)\\bI\\b",`
`45`	`45`	`"name": "markup.inserted log.info"`
`46`	`46`	`},`
`47`	`47`	`{`
`@@ -53,7 +53,7 @@`
`53`	`53`	`"name": "markup.deleted log.warning"`
`54`	`54`	`},`
`55`	`55`	`{`
`56`		`- "match": "\\bW/",`
	`56`	`+ "match": "(?<=^[\\s\\d\\p]*)\\bW\\b",`
`57`	`57`	`"name": "markup.deleted log.warning"`
`58`	`58`	`},`
`59`	`59`	`{`
`@@ -65,7 +65,7 @@`
`65`	`65`	`"name": "string.regexp, strong log.error"`
`66`	`66`	`},`
`67`	`67`	`{`
`68`		`- "match": "\\bE/",`
	`68`	`+ "match": "(?<=^[\\s\\d\\p]*)\\bE\\b",`
`69`	`69`	`"name": "string.regexp, strong log.error"`
`70`	`70`	`},`
`71`	`71`	`{`
`@@ -88,6 +88,10 @@`
`88`	`88`	`"match": "[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}",`
`89`	`89`	`"name": "constant.language log.constant"`
`90`	`90`	`},`
	`91`	`+ {`
	`92`	`+ "match": "([0-9a-fA-F]+[:-])+[0-9a-fA-F]+",`
	`93`	`+ "name": "constant.language log.constant"`
	`94`	`+ },`
`91`	`95`	`{`
`92`	`96`	`"match": "\\b([0-9]+\|true\|false\|null)\\b",`
`93`	`97`	`"name": "constant.language log.constant"`