Skip to content

Commit

Permalink
patch 9.0.2179: no filetype detection for execline scripts
Browse files Browse the repository at this point in the history
Problem:  no filetype detection for execline scripts
Solution: Add filetype detection for execline

as a prior to adding syntax support for execline (see
djpohly/vim-execline#2), i went ahead and made
the filetype detection for execline scripts.

closes: #13689

Signed-Off-By: Mazunki Hoksaas <rolferen@gmail.com>
Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
  • Loading branch information
mazunki authored and chrisbra committed Dec 19, 2023
1 parent 615202b commit 63210c2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
4 changes: 4 additions & 0 deletions runtime/autoload/dist/script.vim
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ export def Exe2filetype(name: string, line1: string): string
elseif name =~ '^dart\>'
return 'dart'

# Execline (s6)
elseif name =~ '^execlineb\>'
return 'execline'

endif

return ''
Expand Down
4 changes: 4 additions & 0 deletions runtime/filetype.vim
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,10 @@ if has("fname_case")
au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW call dist#ft#EuphoriaCheck()
endif

" Execline (s6) scripts
au BufNewFile,BufRead *s6*/\(up\|down\|run\|finish\) setf execline
au BufNewFile,BufRead s6-* setf execline

" Lynx config files
au BufNewFile,BufRead lynx.cfg setf lynx

Expand Down
3 changes: 3 additions & 0 deletions src/testdir/test_filetype.vim
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ def s:GetFilenameChecks(): dict<list<string>>
esqlc: ['file.ec', 'file.EC'],
esterel: ['file.strl'],
eterm: ['anyEterm/file.cfg', 'Eterm/file.cfg', 'some-Eterm/file.cfg'],
execline: ['/etc/s6-rc/run', './s6-rc/src/dbus-srv/up', '/sbin/s6-shutdown'],
exim: ['exim.conf'],
expect: ['file.exp'],
exports: ['exports'],
Expand Down Expand Up @@ -915,6 +916,7 @@ def s:GetScriptChecks(): dict<list<list<string>>>
['#!/path/itclsh'],
['#!/path/itkwish']],
expect: [['#!/path/expect']],
execline: [['#!/sbin/execlineb -S0'], ['#!/usr/bin/execlineb']],
gnuplot: [['#!/path/gnuplot']],
make: [['#!/path/make']],
nix: [['#!/path/nix-shell']],
Expand Down Expand Up @@ -970,6 +972,7 @@ def s:GetScriptEnvChecks(): dict<list<list<string>>>
perl: [['#!/usr/bin/env VAR=val perl']],
scala: [['#!/usr/bin/env VAR=val VVAR=vval scala']],
awk: [['#!/usr/bin/env VAR=val -i awk']],
execline: [['#!/usr/bin/env execlineb']],
scheme: [['#!/usr/bin/env VAR=val --ignore-environment scheme']],
python: [['#!/usr/bin/env VAR=val -S python -w -T']],
wml: [['#!/usr/bin/env VAR=val --split-string wml']],
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2179,
/**/
2178,
/**/
Expand Down

0 comments on commit 63210c2

Please sign in to comment.