Merge pull request #2906 from elebow/shelldetect-fall-back-to-filetype-if-no-hashbang

ShellDetect falls back to filetype if no hashbang (fixes #2886)

1 files changed, 12 insertions, 5 deletions

diff --git a/autoload/ale/handlers/sh.vim b/autoload/ale/handlers/sh.vim
index 75eaf71f..1e50cb89 100644
--- a/autoload/ale/handlers/sh.vim
+++ b/autoload/ale/handlers/sh.vim
@@ -4,17 +4,24 @@
 function! ale#handlers#sh#GetShellType(buffer) abort
     let l:bang_line = get(getbufline(a:buffer, 1), 0, '')
 
+    let l:command = ''
+
     " Take the shell executable from the hashbang, if we can.
     if l:bang_line[:1] is# '#!'
         " Remove options like -e, etc.
         let l:command = substitute(l:bang_line, ' --\?[a-zA-Z0-9]\+', '', 'g')
+    endif
 
-        for l:possible_shell in ['bash', 'dash', 'ash', 'tcsh', 'csh', 'zsh', 'ksh', 'sh']
-            if l:command =~# l:possible_shell . '\s*$'
-                return l:possible_shell
-            endif
-        endfor
+    " If we couldn't find a hashbang, try the filetype
+    if l:command is# ''
+        let l:command = &filetype
     endif
 
+    for l:possible_shell in ['bash', 'dash', 'ash', 'tcsh', 'csh', 'zsh', 'ksh', 'sh']
+        if l:command =~# l:possible_shell . '\s*$'
+            return l:possible_shell
+        endif
+    endfor
+
     return ''
 endfunction