fix(eslint): yarn 2 project cwd (#3684)

* eslint-handler: fix getcwd when there is no node_modules

1 files changed, 11 insertions, 5 deletions

diff --git a/autoload/ale/handlers/eslint.vim b/autoload/ale/handlers/eslint.vim
index 7c492968..374460bc 100644
--- a/autoload/ale/handlers/eslint.vim
+++ b/autoload/ale/handlers/eslint.vim
@@ -2,10 +2,10 @@
 " Description: Functions for working with eslint, for checking or fixing files.
 
 let s:executables = [
+\   '.yarn/sdks/eslint/bin/eslint.js',
 \   'node_modules/.bin/eslint_d',
 \   'node_modules/eslint/bin/eslint.js',
 \   'node_modules/.bin/eslint',
-\   '.yarn/sdks/eslint/bin/eslint',
 \]
 let s:sep = has('win32') ? '\' : '/'
 
@@ -52,14 +52,20 @@ function! ale#handlers#eslint#GetCwd(buffer) abort
     let l:executable = ale#path#FindNearestExecutable(a:buffer, s:executables)
 
     if !empty(l:executable)
-        let l:nmi = strridx(l:executable, 'node_modules')
-        let l:project_dir = l:executable[0:l:nmi - 2]
+        let l:modules_index = strridx(l:executable, 'node_modules')
+        let l:modules_root = l:modules_index > -1 ? l:executable[0:l:modules_index - 2] : ''
+
+        let l:sdks_index = strridx(l:executable, ale#path#Simplify('.yarn/sdks'))
+        let l:sdks_root = l:sdks_index > -1 ? l:executable[0:l:sdks_index - 2] : ''
     else
         let l:modules_dir = ale#path#FindNearestDirectory(a:buffer, 'node_modules')
-        let l:project_dir = !empty(l:modules_dir) ? fnamemodify(l:modules_dir, ':h:h') : ''
+        let l:modules_root = !empty(l:modules_dir) ? fnamemodify(l:modules_dir, ':h:h') : ''
+
+        let l:sdks_dir = ale#path#FindNearestDirectory(a:buffer, ale#path#Simplify('.yarn/sdks'))
+        let l:sdks_root = !empty(l:sdks_dir) ? fnamemodify(l:sdks_dir, ':h:h:h') : ''
     endif
 
-    return !empty(l:project_dir) ? l:project_dir : ''
+    return strlen(l:modules_root) > strlen(l:sdks_root) ? l:modules_root : l:sdks_root
 endfunction
 
 function! ale#handlers#eslint#GetCommand(buffer) abort