runtime(lf): improve syntax script, add filetype plugin
Commit:
https://github.com/vim/vim/commit/7517a8cadfd0e70d0422955cbad4767f6a40f29d
Author: Andis Spri艈姆is <an...@sprinkis.com>
Date: Tue Apr 8 20:34:14 2025 +0200
runtime(lf): improve syntax script, add filetype plugin
- Greatly improve detection and highlighting of command/shell regions,
input-device key labels, escape sequences (@joelim-work)
- Add ftplugin for formatoptions, toggling comment areas
(@andis-sprinkis)
- Add a few missing lf option keywords, rm. old non-working code, misc.
formatting (@andis-sprinkis)
closes: #17078
Signed-off-by: Andis Spri艈姆is <an...@sprinkis.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 180b9e991..68d9a62cf 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -222,6 +222,7 @@ runtime/ftplugin/ldapconf.vim @ribru17
runtime/ftplugin/leo.vim @ribru17
runtime/ftplugin/less.vim @genoma
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
diff --git a/runtime/ftplugin/lf.vim b/runtime/ftplugin/lf.vim
new file mode 100644
index 000000000..7cec11194
--- /dev/null
+++ b/runtime/ftplugin/lf.vim
@@ -0,0 +1,22 @@
+" Vim filetype plugin file
+" Language: lf file manager configuration file (lfrc)
+" Maintainer: Andis Sprinkis <an...@sprinkis.com>
+" URL: https://github.com/andis-sprinkis/lf-vim
+" Last Change: 6 Apr 2025
+
+if exists("b:did_ftplugin") | finish | endif
+
+let b:did_ftplugin = 1
+
+let s:cpo = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setlocal comments< commentstring< formatoptions<"
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
+
+setlocal formatoptions-=t formatoptions+=rol
+
+let &cpo = s:cpo
+unlet s:cpo
diff --git a/runtime/syntax/lf.vim b/runtime/syntax/lf.vim
index 3c1513fe6..2fe2859ec 100644
--- a/runtime/syntax/lf.vim
+++ b/runtime/syntax/lf.vim
@@ -3,242 +3,235 @@
" Maintainer: Andis Sprinkis <an...@sprinkis.com>
" Former Maintainer: Cameron Wright
" URL: https://github.com/andis-sprinkis/lf-vim
-" Last Change: 28 March 2025
-" 29 Mar 2025 by Vim Project (save and restore 'cpo' setting)
+" Last Change: 5 Apr 2025
"
" The shell syntax highlighting is configurable. See $VIMRUNTIME/doc/syntax.txt
" lf version: 34
-if exists("b:current_syntax")
- finish
-endif
+if exists("b:current_syntax") | finish | endif
+
let s:cpo = &cpo
set cpo&vim
let b:current_syntax = "lf"
"{{{ Comment Matching
-syn match lfComment '#.*$'
+syn match lfComment '#.*$'
"}}}
"{{{ String Matching
-syn match lfString "'.*'"
-syn match lfString '".*"' contains=lfVar,lfSpecial
-"}}}
-
-"{{{ Match lf Variables
-syn match lfVar '\$f\|\$fx\|\$fs\|\$id'
+syn match lfString "'.*'"
+syn match lfString '".*"' contains=lfSpecial
"}}}
"{{{ Keywords
-syn keyword lfKeyword set setlocal cmd map cmap skipwhite
+syn keyword lfKeyword set setlocal cmd map cmap skipwhite
"}}}
"{{{ Options Keywords
-syn keyword lfOptions
- \ anchorfind
- \ autoquit
- \ borderfmt
- \ bottom
- \ calcdirsize
- \ cd
- \ cleaner
- \ clear
- \ clearmaps
- \ cmd-capitalize-word
- \ cmd-complete
- \ cmd-delete
- \ cmd-delete-back
- \ cmd-delete-end
- \ cmd-delete-home
- \ cmd-delete-unix-word
- \ cmd-delete-word
- \ cmd-delete-word-back
- \ cmd-end
- \ cmd-enter
- \ cmd-escape
- \ cmd-history-next
- \ cmd-history-prev
- \ cmd-home
- \ cmd-interrupt
- \ cmd-left
- \ cmd-lowercase-word
- \ cmd-menu-accept
- \ cmd-menu-complete
- \ cmd-menu-complete-back
- \ cmd-right
- \ cmd-transpose
- \ cmd-transpose-word
- \ cmd-uppercase-word
- \ cmd-word
- \ cmd-word-back
- \ cmd-yank
- \ copy
- \ copyfmt
- \ cursoractivefmt
- \ cursorparentfmt
- \ cursorpreviewfmt
- \ cut
- \ cutfmt
- \ delete
- \ dircache
- \ dircounts
- \ dirfirst
- \ dironly
- \ dirpreviews
- \ down
- \ draw
- \ drawbox
- \ dupfilefmt
- \ echo
- \ echoerr
- \ echomsg
- \ errorfmt
- \ filesep
- \ filter
- \ find
- \ find-back
- \ find-next
- \ find-prev
- \ findlen
- \ glob-select
- \ glob-unselect
- \ globfilter
- \ globsearch
- \ half-down
- \ half-up
- \ hidden
- \ hiddenfiles
- \ high
- \ history
- \ icons
- \ ifs
- \ ignorecase
- \ ignoredia
- \ incfilter
- \ incsearch
- \ info
- \ infotimefmtnew
- \ infotimefmtold
- \ invert
- \ invert-below
- \ jump-next
- \ jump-prev
- \ load
- \ locale
- \ low
- \ mark-load
- \ mark-remove
- \ mark-save
- \ middle
- \ mouse
- \ number
- \ numberfmt
- \ on-cd
- \ on-focus-gained
- \ on-focus-lost
- \ on-init
- \ on-quit
- \ on-redraw
- \ on-select
- \ open
- \ page-down
- \ page-up
- \ paste
- \ period
- \ pre-cd
- \ preserve
- \ preview
- \ previewer
- \ promptfmt
- \ push
- \ quit
- \ ratios
- \ read
- \ redraw
- \ relativenumber
- \ reload
- \ rename
- \ reverse
- \ roundbox
- \ rulerfmt
- \ scroll-down
- \ scroll-up
- \ scrolloff
- \ search
- \ search-back
- \ search-next
- \ search-prev
- \ select
- \ selectfmt
- \ selmode
- \ setfilter
- \ shell
- \ shell-async
- \ shell-pipe
- \ shell-wait
- \ shellflag
- \ shellopts
- \ showbinds
- \ sixel
- \ smartcase
- \ smartdia
- \ sortby
- \ source
- \ statfmt
- \ sync
- \ tabstop
- \ tag
- \ tag-toggle
- \ tagfmt
- \ tempmarks
- \ timefmt
- \ toggle
- \ top
- \ truncatechar
- \ truncatepct
- \ unselect
- \ up
- \ updir
- \ waitmsg
- \ watch
- \ wrapscan
- \ wrapscroll
+syn keyword lfOptions
+ \ anchorfind
+ \ autoquit
+ \ borderfmt
+ \ bottom
+ \ calcdirsize
+ \ cd
+ \ cleaner
+ \ clear
+ \ clearmaps
+ \ cmaps
+ \ cmd-capitalize-word
+ \ cmd-complete
+ \ cmd-delete
+ \ cmd-delete-back
+ \ cmd-delete-end
+ \ cmd-delete-home
+ \ cmd-delete-unix-word
+ \ cmd-delete-word
+ \ cmd-delete-word-back
+ \ cmd-end
+ \ cmd-enter
+ \ cmd-escape
+ \ cmd-history-next
+ \ cmd-history-prev
+ \ cmd-home
+ \ cmd-interrupt
+ \ cmd-left
+ \ cmd-lowercase-word
+ \ cmd-menu-accept
+ \ cmd-menu-complete
+ \ cmd-menu-complete-back
+ \ cmd-right
+ \ cmd-transpose
+ \ cmd-transpose-word
+ \ cmd-uppercase-word
+ \ cmd-word
+ \ cmd-word-back
+ \ cmd-yank
+ \ cmds
+ \ copy
+ \ copyfmt
+ \ cursoractivefmt
+ \ cursorparentfmt
+ \ cursorpreviewfmt
+ \ cut
+ \ cutfmt
+ \ delete
+ \ dircache
+ \ dircounts
+ \ dirfirst
+ \ dironly
+ \ dirpreviews
+ \ doc
+ \ down
+ \ draw
+ \ drawbox
+ \ dupfilefmt
+ \ echo
+ \ echoerr
+ \ echomsg
+ \ errorfmt
+ \ filesep
+ \ filter
+ \ find
+ \ find-back
+ \ find-next
+ \ find-prev
+ \ findlen
+ \ glob-select
+ \ glob-unselect
+ \ globfilter
+ \ globsearch
+ \ half-down
+ \ half-up
+ \ hidden
+ \ hiddenfiles
+ \ high
+ \ history
+ \ icons
+ \ ifs
+ \ ignorecase
+ \ ignoredia
+ \ incfilter
+ \ incsearch
+ \ info
+ \ infotimefmtnew
+ \ infotimefmtold
+ \ invert
+ \ invert-below
+ \ jump-next
+ \ jump-prev
+ \ load
+ \ locale
+ \ low
+ \ maps
+ \ mark-load
+ \ mark-remove
+ \ mark-save
+ \ middle
+ \ mouse
+ \ number
+ \ numberfmt
+ \ on-cd
+ \ on-focus-gained
+ \ on-focus-lost
+ \ on-init
+ \ on-quit
+ \ on-redraw
+ \ on-select
+ \ open
+ \ page-down
+ \ page-up
+ \ paste
+ \ period
+ \ pre-cd
+ \ preserve
+ \ preview
+ \ previewer
+ \ promptfmt
+ \ push
+ \ quit
+ \ ratios
+ \ read
+ \ redraw
+ \ relativenumber
+ \ reload
+ \ rename
+ \ reverse
+ \ roundbox
+ \ rulerfmt
+ \ scroll-down
+ \ scroll-up
+ \ scrolloff
+ \ search
+ \ search-back
+ \ search-next
+ \ search-prev
+ \ select
+ \ selectfmt
+ \ selmode
+ \ setfilter
+ \ shell
+ \ shell-async
+ \ shell-pipe
+ \ shell-wait
+ \ shellflag
+ \ shellopts
+ \ showbinds
+ \ sixel
+ \ smartcase
+ \ smartdia
+ \ sortby
+ \ source
+ \ statfmt
+ \ sync
+ \ tabstop
+ \ tag
+ \ tag-toggle
+ \ tagfmt
+ \ tempmarks
+ \ timefmt
+ \ toggle
+ \ top
+ \ truncatechar
+ \ truncatepct
+ \ unselect
+ \ up
+ \ updir
+ \ waitmsg
+ \ watch
+ \ wrapscan
+ \ wrapscroll
"}}}
"{{{ Special Matching
-syn match lfSpecial '<.*>\|\.'
+syn match lfSpecial ' \<[^>]+\>'
+syn match lfSpecial ' \(["\abfnrtv]|\o+)'
"}}}
"{{{ Shell Script Matching for cmd
let s:shell_syntax = get(g:, 'lf_shell_syntax', "syntax/sh.vim")
let s:shell_syntax = get(b:, 'lf_shell_syntax', s:shell_syntax)
+
unlet b:current_syntax
exe 'syn include @Shell '.s:shell_syntax
let b:current_syntax = "lf"
-syn region lfIgnore start=".{{
" end="^}}"
- \ keepend contains=lfExternalShell,lfExternalPatch
-syn match lfShell '\$[a-zA-Z].*$
- \|:[a-zA-Z].*$
- \|%[a-zA-Z].*$
- \|![a-zA-Z].*$
- \|&[a-zA-Z].*$'
- \ transparent contains=@Shell,lfExternalPatch
-syn match lfExternalShell "^.*$" transparent contained contains=@Shell
-syn match lfExternalPatch "^\s*cmd\ .*\ .{{$\|^}}$" contained
+
+syn region lfCommand matchgroup=lfCommandMarker start=' \zs:\ze' end='$'
keepend transparent
+syn region lfCommand matchgroup=lfCommandMarker start=' \zs:{{\ze' end='}}'
keepend transparent
+syn region lfShell matchgroup=lfShellMarker start=' \zs[$!%&]\ze' end='$'
keepend contains=@Shell
+syn region lfShell matchgroup=lfShellMarker start=' \zs[$!%&]{{\ze' end='}}'
keepend contains=@Shell
"}}}
"{{{ Link Highlighting
-hi def link lfComment Comment
-hi def link lfVar Type
-hi def link lfSpecial Special
-hi def link lfString String
-hi def link lfKeyword Statement
-hi def link lfOptions Constant
-hi def link lfConstant Constant
-hi def link lfExternalShell Normal
-hi def link lfExternalPatch Special
-hi def link lfIgnore Special
+hi def link lfComment Comment
+hi def link lfSpecial SpecialChar
+hi def link lfString String
+hi def link lfKeyword Statement
+hi def link lfOptions Constant
+hi def link lfCommandMarker Special
+hi def link lfShellMarker Special
"}}}
+
let &cpo = s:cpo
unlet s:cpo
--
--
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1u2Dwa-008Yyr-I5%40256bit.org.
