Fix #2276 - Replace a potentially infinite loop for hie

This commit is contained in:
w0rp 2019-02-07 16:24:41 +00:00
parent 0ed3fbc596
commit 0c6370f41a
No known key found for this signature in database
GPG Key ID: 0FC1ECAA8C81CD83
1 changed files with 9 additions and 15 deletions

View File

@ -9,26 +9,20 @@ function! ale_linters#haskell#hie#GetProjectRoot(buffer) abort
" If it's empty, search for the cabal file " If it's empty, search for the cabal file
if empty(l:project_file) if empty(l:project_file)
let l:cabal_file = fnamemodify(bufname(a:buffer), ':p:h') " Search all of the paths except for the root filesystem path.
let l:paths = '' let l:paths = join(
\ ale#path#Upwards(expand('#' . a:buffer . ':p:h'))[:-2],
while empty(matchstr(l:cabal_file, '^\(\/\|\(\w:\\\)\)$')) \ ','
let l:cabal_file = fnamemodify(l:cabal_file, ':h') \)
let l:paths = l:paths . l:cabal_file . ','
endwhile
let l:project_file = globpath(l:paths, '*.cabal') let l:project_file = globpath(l:paths, '*.cabal')
endif endif
" Either extract the project directory or take the current working " If we still can't find one, use the current file.
" directory if empty(l:project_file)
if !empty(l:project_file) let l:project_file = expand('#' . a:buffer . ':p')
let l:project_file = fnamemodify(l:project_file, ':h')
else
let l:project_file = expand('#' . a:buffer . ':p:h')
endif endif
return l:project_file return fnamemodify(l:project_file, ':h')
endfunction endfunction
function! ale_linters#haskell#hie#GetCommand(buffer) abort function! ale_linters#haskell#hie#GetCommand(buffer) abort