patch 9.1.0965: filetype: sh filetype set when detecting the use of bash

Problem:  filetype: sh filetype set when detecting the use of bash
Solution: when bash is detected, use 'bash' filetype instead
          (Luca Saccarola)

closes: #16309

Signed-off-by: Luca Saccarola <github.e41mv@aleeas.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 0936a85ede9adfd4320ded0254ff9815fa193569..ce7f44fa65ac8cb0202e5c907d0708f4e8650270 100644 (file)
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -896,6 +896,7 @@ export def SetFileTypeSH(name: string, setft = true): string
     if exists("b:is_sh")
       unlet b:is_sh
     endif
+    return SetFileTypeShell("bash", setft)
   elseif name =~ '\<sh\>' || name =~ '\<dash\>'
     # Ubuntu links "sh" to "dash", thus it is expected to work the same way
     b:is_sh = 1

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 27ced5207177ff2a94b1c328638486fefb766307..6b1f0fb8ea234a4c94915f24cd8b1c28baf89c72 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -128,6 +128,10 @@ def s:GetFilenameChecks(): dict<list<string>>
     awk: ['file.awk', 'file.gawk'],
     b: ['file.mch', 'file.ref', 'file.imp'],
     basic: ['file.bas', 'file.bi', 'file.bm'],
+    bash: ['.bashrc', '.bash_profile', '.bash-profile', '.bash_logout',
+           '.bash-logout', '.bash_aliases', '.bash-aliases', '.bash_history',
+           '.bash-history', '/tmp/bash-fc-3Ozjlw', '/tmp/bash-fc.3Ozjlw', 'PKGBUILD',
+           'file.bash', 'file.bats',  'file.cygport'],
     bass: ['file.bass'],
     bc: ['file.bc'],
     bdf: ['file.bdf'],
@@ -685,11 +689,12 @@ def s:GetFilenameChecks(): dict<list<string>>
     services: ['/etc/services', 'any/etc/services'],
     setserial: ['/etc/serial.conf', 'any/etc/serial.conf'],
     sexplib: ['file.sexp'],
-    sh: ['.bashrc', '.bash_profile', '.bash-profile', '.bash_logout', '.bash-logout', '.bash_aliases', '.bash-aliases', '.bash_history', '.bash-history',
-         '/tmp/bash-fc-3Ozjlw', '/tmp/bash-fc.3Ozjlw', 'PKGBUILD', 'file.bash', '/usr/share/doc/bash-completion/filter.sh',
-         '/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf', 'file.bats', '.ash_history', 'any/etc/neofetch/config.conf', '.xprofile',
-         'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf', 'file.mdd', 'file.cygport', '.env', '.envrc', 'devscripts.conf',
-         '.devscripts', 'file.lo', 'file.la', 'file.lai'],
+    sh: ['/usr/share/doc/bash-completion/filter.sh',
+         '/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf',
+         '.ash_history', 'any/etc/neofetch/config.conf', '.xprofile',
+         'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf',
+         'file.mdd', '.env', '.envrc', 'devscripts.conf', '.devscripts', 'file.lo',
+         'file.la', 'file.lai'],
     sieve: ['file.siv', 'file.sieve'],
     sil: ['file.sil'],
     simula: ['file.sim'],
@@ -984,11 +989,11 @@ def s:GetScriptChecks(): dict<list<list<string>>>
     clojure: [['#!/path/clojure']],
     scala:  [['#!/path/scala']],
     sh:     [['#!/path/sh'],
-            ['#!/path/bash'],
-            ['#!/path/bash2'],
             ['#!/path/dash'],
             ['#!/path/ksh'],
             ['#!/path/ksh93']],
+    bash:   [['#!/path/bash'],
+            ['#!/path/bash2']],
     csh:    [['#!/path/csh']],
     tcsh:   [['#!/path/tcsh']],
     zsh:    [['#!/path/zsh']],

diff --git a/src/version.c b/src/version.c
index e1e0e36bc33e1c995c47f3e30e296a63dd93c3fc..622a0a1c663f98005c107e49eb622b8687c6ce30 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    965,
 /**/
     964,
 /**/