patch 9.1.1755: filetype: generic log files are not recognized
Commit:
https://github.com/vim/vim/commit/b8970b43cd4aab1da9d0b927d86c7021bcae7e35
Author: Mao-Yining <[email protected]>
Date: Sun Sep 14 03:59:34 2025 -0400
patch 9.1.1755: filetype: generic log files are not recognized
Problem: filetype: generic log files are not recognized
Solution: Detect *.log files as log filetype, include simple log syntax
script (Mao-Yining).
closes: #18285
Co-authored-by: Christian Brabandt <[email protected]>
Signed-off-by: Mao-Yining <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index a43aebfa6..e94c3cbc5 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -187,8 +187,8 @@ runtime/ftplugin/gyp.vim
@ObserverOfTime
runtime/ftplugin/haml.vim @tpope
runtime/ftplugin/hare.vim @selenebun
runtime/ftplugin/haredoc.vim @selenebun
-runtime/ftplugin/heex.vim @cvincent
runtime/ftplugin/hcl.vim @gpanders
+runtime/ftplugin/heex.vim @cvincent
runtime/ftplugin/hgcommit.vim @k-takata
runtime/ftplugin/hlsplaylist.vim @avidseeker
runtime/ftplugin/hog.vim @wtfbbqhax
@@ -205,16 +205,17 @@ runtime/ftplugin/javacc.vim
@ribru17
runtime/ftplugin/javascript.vim @dkearns
runtime/ftplugin/javascriptreact.vim @dkearns
runtime/ftplugin/jjdescription.vim @gpanders
+runtime/ftplugin/jq.vim @vito-c
runtime/ftplugin/json.vim @dbarnett
runtime/ftplugin/json5.vim @dkearns
runtime/ftplugin/jsonc.vim @izhakjakov
runtime/ftplugin/julia.vim @carlobaldassi
runtime/ftplugin/just.vim @pbnj
-runtime/ftplugin/jq.vim @vito-c
runtime/ftplugin/kconfig.vim @chrisbra
runtime/ftplugin/kdl.vim @imsnif @jiangyinzuo
runtime/ftplugin/kivy.vim @ribru17
runtime/ftplugin/kotlin.vim @udalov
+runtime/ftplugin/lc.vim @ribru17
runtime/ftplugin/ldapconf.vim @ribru17
runtime/ftplugin/leo.vim @ribru17
runtime/ftplugin/less.vim @genoma
@@ -222,7 +223,6 @@ runtime/ftplugin/lex.vim @ribru17
runtime/ftplugin/lf.vim @andis-sprinkis
runtime/ftplugin/liquid.vim @tpope
runtime/ftplugin/lua.vim @dkearns
-runtime/ftplugin/lc.vim @ribru17
runtime/ftplugin/lynx.vim @dkearns
runtime/ftplugin/m17ndb.vim @dseomn
runtime/ftplugin/m3build.vim @dkearns
@@ -543,9 +543,10 @@ runtime/syntax/krl.vim
@KnoP-01
runtime/syntax/less.vim @genoma
runtime/syntax/lf.vim @andis-sprinkis
runtime/syntax/liquid.vim @tpope
+runtime/syntax/log.vim @mao-yining
runtime/syntax/lua.vim @marcuscf
-runtime/syntax/lyrics.vim @ObserverOfTime
runtime/syntax/lynx.vim @dkearns
+runtime/syntax/lyrics.vim @ObserverOfTime
runtime/syntax/m17ndb.vim @dseomn
runtime/syntax/m3build.vim @dkearns
runtime/syntax/m3quake.vim @dkearns
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d53a2126f..a68830e71 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -3410,6 +3410,9 @@ au BufNewFile,BufRead *.blp setf
blueprint
" Blueprint build system file
au BufNewFile,BufRead *.bp setf bp
+" Generic log file
+au BufNewFile,BufRead *.log,*_log,*.LOG,*_LOG setf log
+
" Use the filetype detect plugins. They may overrule any of the previously
" detected filetypes.
runtime! ftdetect/*.vim
diff --git a/runtime/syntax/log.vim b/runtime/syntax/log.vim
new file mode 100644
index 000000000..336fc7dfd
--- /dev/null
+++ b/runtime/syntax/log.vim
@@ -0,0 +1,157 @@
+" Vim syntax file
+" Language: Generic log file
+" Maintainer: Mao-Yining <https://github.com/mao-yining>
+" Former Maintainer: MTDL9 <https://github.com/MTDL9>
+" Latest Revision: 2025-09-13
+
+if exists('b:current_syntax')
+ finish
+endif
+
+syntax case ignore
+
+" Operators
+"---------------------------------------------------------------------------
+syn match logOperator display '[;,\?\:\.\<=\>\~\/\@\!$\%&\+\-\|\^(){}\*#]'
+syn match logBrackets display '[][]'
+syn match logSeparator display '-\{3,}'
+syn match logSeparator display '\*\{3,}'
+syn match logSeparator display '=\{3,}'
+syn match logSeparator display '- - '
+
+
+" Constants
+"---------------------------------------------------------------------------
+syn match logNumber '\<-\?\d\+\>'
+syn match logHexNumber '\<0[xX]\x\+\>'
+syn match logHexNumber '\<\d\x\+\>'
+syn match logBinaryNumber '\<0[bB][01]\+\>'
+syn match logFloatNumber '\<\d.\d\+[eE]\?\>'
+
+syn keyword logBoolean true false
+syn keyword logNull null nil nullptr none
+
+syn region logString start=/"/ end=/"/ end=/$/ skip=/\./
+" Quoted strings, but no match on quotes like "don't", "plurals' elements"
+syn region logString start=/'\(s \|t \| \w\)\@!/ end=/'/ end=/$/ end=/s /
skip=/\./
+
+
+" Dates and Times
+"---------------------------------------------------------------------------
+" Matches 2018-03-12T or 12/03/2018 or 12/Mar/2018 or 27 Nov 2023
+syn match logDate '\d\{2,4}[-/
]\(\d\{2}\|Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\)[-/
]\d\{2,4}T\?'
+" Matches 8 digit numbers at start of line starting with 20
+syn match logDate '^20\d\{6}'
+" Matches Fri Jan 09 or Feb 11 or Apr 3 or Sun 3
+syn keyword logDate Mon Tue Wed Thu Fri Sat Sun Jan Feb Mar Apr May Jun Jul
Aug Sep Oct Nov Dec nextgroup=logDateDay
+syn match logDateDay '\s\{1,2}\d\{1,2}' contained
+
+" Matches 12:09:38 or 00:03:38.129Z or 01:32:12.102938 +0700 or
01:32:12.1234567890 or 21:14:18+11:00
+syn match logTime
'\d\{2}:\d\{2}:\d\{2}\(\.\d\{2,9}\)\?\(\s\?[-+]\(\d\{1,2\}:\d\{2\}\|\d\{2,4}\)\|Z\)\?\>'
nextgroup=logTimeZone,logSysColumns skipwhite
+
+" Follows logTime, matches UTC or PDT 2019 or 2019 EDT
+syn match logTimeZone '[A-Z]\{2,5}\>\( \d\{4}\)\?' contained
+syn match logTimeZone '\d\{4} [A-Z]\{2,5}\>' contained
+
+" Matches time durations like 1ms or 1y 2d 23ns
+syn match logDuration '\(^\|\s\)\@<=\d\+\s*[mn]\?[ywdhms]\(\s\|$\)\@='
+
+" Entities
+"---------------------------------------------------------------------------
+syn match logUrl 'http[s]\?:\/\/\S\+'
+syn match logDomain
'\(^\|\W\)\@<=[[:alnum:]-]\+\(\.[[:alnum:]-]\+\)\+\(\W\|$\)\@='
+syn match logUUID '\w\{8}-\w\{4}-\w\{4}-\w\{4}-\w\{12}'
+syn match logMD5 '\<[a-z0-9]\{32}\>'
+syn match logIPV4 '\<\d\{1,3}\(\.\d\{1,3}\)\{3}\>'
+syn match logIPV6 '\<\x\{1,4}\(:\x\{1,4}\)\{7}\>'
+syn match logMacAddress '\<\x\{2}\(:\x\{2}\)\{5}'
+syn match logFilePath '\<\w:\ \+'
+syn match logFilePath '[^a-zA-Z0-9"']\@<=/ \+'
+
+
+" Syslog Columns
+"---------------------------------------------------------------------------
+" Syslog hostname, program and process number columns
+syn match logSysColumns '\w\(\w\|\.\|-\)\+ \(\w\|\.\|-\)\+\(\[\d\+\]\)\?:'
contains=logOperator,logSysProcess contained
+syn match logSysProcess '\(\w\|\.\|-\)\+\(\[\d\+\]\)\?:'
contains=logOperator,logNumber,logBrackets contained
+
+
+" XML Tags
+"---------------------------------------------------------------------------
+" Simplified matches, not accurate with the spec to avoid false positives
+syn match logXmlHeader
/<?\(\w\|-\)\+\(\s\+\w\+\(="[^"]*"\|='[^']*'\)\?\)*?>/
contains=logString,logXmlAttribute,logXmlNamespace
+syn match logXmlDoctype /<!DOCTYPE[^>]*>/
contains=logString,logXmlAttribute,logXmlNamespace
+syn match logXmlTag /<\/\?\(\(\w\|-\)\+:\)\?\(\w\|-\)\+\(\(
\|\s\)\+\(\(\w\|-\)\+:\)\?\(\w\|-\)\+\(="[^"]*"\|='[^']*'\)\?\)*\s*\/\?>/
contains=logString,logXmlAttribute,logXmlNamespace
+syn match logXmlAttribute contained "\w\+=" contains=logOperator
+syn match logXmlAttribute contained "\(
\|\s\)\(\(\w\|-\)\+:\)\?\(\w\|-\)\+\(=\)\?" contains=logXmlNamespace,logOperator
+syn match logXmlNamespace contained "\(\w\|-\)\+:" contains=logOperator
+syn region logXmlComment start=/<!--/ end=/-->/
+syn match logXmlCData /<!\[CDATA\[.*\]\]>/
+syn match logXmlEntity /&#\?\w\+;/
+
+
+" Levels
+"---------------------------------------------------------------------------
+syn keyword logLevelEmergency EMERGENCY EMERG
+syn keyword logLevelAlert ALERT
+syn keyword logLevelCritical CRITICAL CRIT FATAL
+syn keyword logLevelError ERROR ERR FAILURE SEVERE
+syn keyword logLevelWarning WARNING WARN
+syn keyword logLevelNotice NOTICE
+syn keyword logLevelInfo INFO
+syn keyword logLevelDebug DEBUG FINE
+syn keyword logLevelTrace TRACE FINER FINEST
+
+
+" Highlight links
+"---------------------------------------------------------------------------
+hi def link logNumber Number
+hi def link logHexNumber Number
+hi def link logBinaryNumber Number
+hi def link logFloatNumber Float
+hi def link logBoolean Boolean
+hi def link logNull Constant
+hi def link logString String
+
+hi def link logDate Identifier
+hi def link logDateDay Identifier
+hi def link logTime Function
+hi def link logTimeZone Identifier
+hi def link logDuration Identifier
+
+hi def link logUrl Underlined
+hi def link logDomain Label
+hi def link logUUID Label
+hi def link logMD5 Label
+hi def link logIPV4 Label
+hi def link logIPV6 ErrorMsg
+hi def link logMacAddress Label
+hi def link logFilePath Conditional
+
+hi def link logSysColumns Conditional
+hi def link logSysProcess Include
+
+hi def link logXmlHeader Function
+hi def link logXmlDoctype Function
+hi def link logXmlTag Identifier
+hi def link logXmlAttribute Type
+hi def link logXmlNamespace Include
+hi def link logXmlComment Comment
+hi def link logXmlCData String
+hi def link logXmlEntity Special
+
+hi def link logOperator Operator
+hi def link logBrackets Comment
+hi def link logSeparator Comment
+
+hi def link logLevelEmergency ErrorMsg
+hi def link logLevelAlert ErrorMsg
+hi def link logLevelCritical ErrorMsg
+hi def link logLevelError ErrorMsg
+hi def link logLevelWarning WarningMsg
+hi def link logLevelNotice Character
+hi def link logLevelInfo Repeat
+hi def link logLevelDebug Debug
+hi def link logLevelTrace Comment
+
+let b:current_syntax = 'log'
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8452739b3..22d9f850f 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -454,6 +454,7 @@ def s:GetFilenameChecks(): dict<list<string>>
lite: ['file.lite', 'file.lt'],
litestep: ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'],
livebook: ['file.livemd'],
+ log: ['file.log', 'file_log', 'file.LOG', 'file_LOG'],
logcheck: ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file',
'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'],
loginaccess: ['/etc/login.access', 'any/etc/login.access'],
logindefs: ['/etc/login.defs', 'any/etc/login.defs'],
diff --git a/src/version.c b/src/version.c
index 89787c4d6..01f1f9799 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1755,
/**/
1754,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uxht5-005d4s-CX%40256bit.org.
