diff --git a/src/components/widgets/filesystem/FileEditor.vue b/src/components/widgets/filesystem/FileEditor.vue index f47d79dc3b..31f5dc5189 100644 --- a/src/components/widgets/filesystem/FileEditor.vue +++ b/src/components/widgets/filesystem/FileEditor.vue @@ -72,12 +72,12 @@ export default class FileEditor extends Vue { const grammars = new Map() grammars.set('gcode', 'source.gcode') grammars.set('klipper-config', 'source.klipper-config') - // grammars.set('log', 'text.log') + grammars.set('log', 'text.log') // ... and our languages monaco.languages.register({ id: 'gcode', extensions: ['gcode', 'g', 'gc', 'gco', 'ufp', 'nc'] }) monaco.languages.register({ id: 'klipper-config', extensions: ['cfg', 'conf'] }) - // monaco.languages.register({ id: 'log', extensions: ['log'] }) + monaco.languages.register({ id: 'log', extensions: ['log'] }) // Define how commenting works. monaco.languages.setLanguageConfiguration('gcode', { diff --git a/src/monaco/language/log.tmLanguage.json b/src/monaco/language/log.tmLanguage.json index a2eabc902f..a5bfab968d 100644 --- a/src/monaco/language/log.tmLanguage.json +++ b/src/monaco/language/log.tmLanguage.json @@ -1,119 +1,67 @@ { - "name": "Log file", "scopeName": "text.log", - "patterns": [ - { - "match": "\\b(Trace)\\b:", - "name": "comment log.verbose" - }, - { - "match": "(?i)\\[(verbose|verb|vrb|vb|v)\\]", - "name": "comment log.verbose" - }, - { - "match": "(?<=^[\\s\\d\\p]*)\\bV\\b", - "name": "comment log.verbose" - }, - { - "match": "\\b(DEBUG|Debug)\\b|(?i)\\b(debug)\\:", - "name": "markup.changed log.debug" - }, - { - "match": "(?i)\\[(debug|dbug|dbg|de|d)\\]", - "name": "markup.changed log.debug" - }, - { - "match": "(?<=^[\\s\\d\\p]*)\\bD\\b", - "name": "markup.changed log.debug" - }, - { - "match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info|information)\\:", - "name": "markup.inserted log.info" - }, - { - "match": "(?i)\\[(information|info|inf|in|i)\\]", - "name": "markup.inserted log.info" - }, - { - "match": "(?<=^[\\s\\d\\p]*)\\bI\\b", - "name": "markup.inserted log.info" - }, - { - "match": "\\b(WARNING|WARN|Warn|WW)\\b|(?i)\\b(warning)\\:", - "name": "markup.deleted log.warning" - }, - { - "match": "(?i)\\[(warning|warn|wrn|wn|w)\\]", - "name": "markup.deleted log.warning" - }, - { - "match": "(?<=^[\\s\\d\\p]*)\\bW\\b", - "name": "markup.deleted log.warning" - }, - { - "match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error)\\:", - "name": "string.regexp, strong log.error" - }, - { - "match": "(?i)\\[(error|eror|err|er|e|fatal|fatl|ftl|fa|f)\\]", - "name": "string.regexp, strong log.error" - }, - { - "match": "(?<=^[\\s\\d\\p]*)\\bE\\b", - "name": "string.regexp, strong log.error" - }, - { - "match": "\\b\\d{4}-\\d{2}-\\d{2}(T|\\b)", - "name": "comment log.date" - }, - { - "match": "(?<=(^|\\s))\\d{2}[^\\w\\s]\\d{2}[^\\w\\s]\\d{4}\\b", - "name": "comment log.date" - }, - { - "match": "\\d{1,2}:\\d{2}(:\\d{2}([.,]\\d{1,})?)?(Z| ?[+-]\\d{1,2}:\\d{2})?\\b", - "name": "comment log.date" - }, - { - "match": "\\b([0-9a-fA-F]{40}|[0-9a-fA-F]{10}|[0-9a-fA-F]{7})\\b", - "name": "constant.language" - }, - { - "match": "\\b[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}\\b", - "name": "constant.language log.constant" - }, - { - "match": "\\b([0-9a-fA-F]{2,}[:-])+[0-9a-fA-F]{2,}+\\b", - "name": "constant.language log.constant" - }, - { - "match": "\\b([0-9]+|true|false|null)\\b", - "name": "constant.language log.constant" - }, - { - "match": "\"[^\"]*\"", - "name": "string log.string" - }, - { - "match": "(?