Merge remote-tracking branch 'upstream/master'

autoload/ale/handlers/sh.vim

@@ -1,18 +1,28 @@
 " Author: w0rp <devw0rp@gmail.com>
 
-" Get the shell type for a buffer, based on the hashbang line.
 function! ale#handlers#sh#GetShellType(buffer) abort
-    let l:bang_line = get(getbufline(a:buffer, 1), 0, '')
+    let l:shebang = 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# '#!'
+    " Take the shell executable from the shebang, if we can.
+    if l:shebang[:1] is# '#!'
         " Remove options like -e, etc.
-        let l:command = substitute(l:bang_line, ' --\?[a-zA-Z0-9]\+', '', 'g')
+        let l:command = substitute(l:shebang, ' --\?[a-zA-Z0-9]\+', '', 'g')
     endif
 
-    " If we couldn't find a hashbang, try the filetype
+    " With no shebang line, attempt to use Vim's buffer-local variables.
+    if l:command is# ''
+        if getbufvar(a:buffer, 'is_bash', 0)
+            let l:command = 'bash'
+        elseif getbufvar(a:buffer, 'is_sh', 0)
+            let l:command = 'sh'
+        elseif getbufvar(a:buffer, 'is_kornshell', 0)
+            let l:command = 'ksh'
+        endif
+    endif
+
+    " If we couldn't find a shebang, try the filetype
     if l:command is# ''
         let l:command = &filetype
     endif

autoload/ale/handlers/shellcheck.vim

@@ -13,15 +13,6 @@ function! ale#handlers#shellcheck#GetDialectArgument(buffer) abort
         return l:shell_type
     endif
 
-    " If there's no hashbang, try using Vim's buffer variables.
-    if getbufvar(a:buffer, 'is_bash', 0)
-        return 'bash'
-    elseif getbufvar(a:buffer, 'is_sh', 0)
-        return 'sh'
-    elseif getbufvar(a:buffer, 'is_kornshell', 0)
-        return 'ksh'
-    endif
-
     return ''
 endfunction