diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2018-12-26 10:41:57 +0100 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2018-12-26 10:41:57 +0100 |
| commit | d43b70d93987c94d15a352cf0026fb93d3317cc8 (patch) | |
| tree | 74470b6cc30ddb4ef8ceb2ec557bc32ccccb5ebb /autoload/elm.vim | |
| parent | ec1c94306953b678bb36572897bd218fe6c76506 (diff) | |
| download | vim-polyglot-d43b70d93987c94d15a352cf0026fb93d3317cc8.tar.gz vim-polyglot-d43b70d93987c94d15a352cf0026fb93d3317cc8.zip | |
Update
Diffstat (limited to 'autoload/elm.vim')
| -rw-r--r-- | autoload/elm.vim | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/autoload/elm.vim b/autoload/elm.vim index 85a1a0b2..00b15947 100644 --- a/autoload/elm.vim +++ b/autoload/elm.vim @@ -349,11 +349,14 @@ function! elm#FindRootDirectory() abort if empty(l:elm_root) let l:current_file = expand('%:p') let l:dir_current_file = fnameescape(fnamemodify(l:current_file, ':h')) - let l:match = findfile('elm-package.json', l:dir_current_file . ';') - if empty(l:match) - let l:elm_root = '' + let l:old_match = findfile('elm-package.json', l:dir_current_file . ';') + let l:new_match = findfile('elm.json', l:dir_current_file . ';') + if !empty(l:new_match) + let l:elm_root = fnamemodify(l:new_match, ':p:h') + elseif !empty(l:old_match) + let l:elm_root = fnamemodify(l:old_match, ':p:h') else - let l:elm_root = fnamemodify(l:match, ':p:h') + let l:elm_root = '' endif if !empty(l:elm_root) |