diff --git a/extensions/log/cgmanifest.json b/extensions/log/cgmanifest.json index c1f8ba39dde37..9fbad891e52ab 100644 --- 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": "fc571bd87b33bb69d3bdc0052f94face723ee4f7" + "commitHash": "396c8552ff99d0e07142fdd940d75dae212dd28c" } }, "license": "MIT", - "version": "3.3.4" + "version": "3.4.0" } ], "version": 1 diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.tmLanguage.json index 50122fd7ee9c7..4a969138b1c3c 100644 --- a/extensions/log/syntaxes/log.tmLanguage.json +++ b/extensions/log/syntaxes/log.tmLanguage.json @@ -4,12 +4,12 @@ "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/fc571bd87b33bb69d3bdc0052f94face723ee4f7", + "version": "https://github.com/emilast/vscode-logfile-highlighter/commit/396c8552ff99d0e07142fdd940d75dae212dd28c", "name": "Log file", "scopeName": "text.log", "patterns": [ { - "match": "\\b(Trace)\\b:", + "match": "\\b([Tt]race|TRACE)\\b:?", "name": "comment log.verbose" }, { diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json index f75b3a1731a46..853eea1a14cba 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json @@ -56,7 +56,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand ", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand ", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -140,7 +168,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand setContext", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand setContext", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -210,7 +266,35 @@ } }, { - "c": "] [renderer1] [trace] SCMService#registerSCMProvider", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] SCMService#registerSCMProvider", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -280,7 +364,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand setContext", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand setContext", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -350,7 +462,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand ", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand ", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -434,7 +574,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand ", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand ", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -518,7 +686,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand ", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand ", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -602,7 +798,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand ", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand ", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -686,7 +910,35 @@ } }, { - "c": "] [renderer1] [trace] CommandService#executeCommand ", + "c": "] [renderer1] [", + "t": "text.log", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "trace", + "t": "text.log comment log.verbose", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "] CommandService#executeCommand ", "t": "text.log", "r": { "dark_plus": "default: #D4D4D4", @@ -713,4 +965,4 @@ "light_modern": "constant.language: #0000FF" } } -] \ No newline at end of file +]