Merge branch 'master' into sridhars

4 files changed, 41 insertions, 38 deletions

diff --git a/ale_linters/scala/fsc.vim b/ale_linters/scala/fsc.vim
index 17b26f0b..fbdce20e 100644
--- a/ale_linters/scala/fsc.vim
+++ b/ale_linters/scala/fsc.vim
@@ -1,29 +1,14 @@
 " Author: Nils Leuzinger - https://github.com/PawkyPenguin
 " Description: Basic scala support using fsc
-"
-function! ale_linters#scala#fsc#GetExecutable(buffer) abort
-    if index(split(getbufvar(a:buffer, '&filetype'), '\.'), 'sbt') >= 0
-        " Don't check sbt files
-        return ''
-    endif
 
-    return 'fsc'
-endfunction
-
-function! ale_linters#scala#fsc#GetCommand(buffer) abort
-    let l:executable = ale_linters#scala#fsc#GetExecutable(a:buffer)
-
-    if empty(l:executable)
-        return ''
-    endif
-
-    return ale#Escape(l:executable) . ' -Ystop-after:parser %t'
+function! s:IsSbt(buffer) abort
+    return index(split(getbufvar(a:buffer, '&filetype'), '\.'), 'sbt') >= 0
 endfunction
 
 call ale#linter#Define('scala', {
 \   'name': 'fsc',
-\   'executable_callback': 'ale_linters#scala#fsc#GetExecutable',
-\   'command_callback': 'ale_linters#scala#fsc#GetCommand',
+\   'executable_callback': {buf -> s:IsSbt(buf) ? '' : 'fsc'},
+\   'command': '%e -Ystop-after:parser %t',
 \   'callback': 'ale#handlers#scala#HandleScalacLintFormat',
 \   'output_stream': 'stderr',
 \})
diff --git a/ale_linters/scala/sbtserver.vim b/ale_linters/scala/sbtserver.vim
new file mode 100644
index 00000000..694241d7
--- /dev/null
+++ b/ale_linters/scala/sbtserver.vim
@@ -0,0 +1,31 @@
+" Author: ophirr33 <coghlan.ty@gmail.com>
+" Description: TCP lsp client for sbt Server
+
+call ale#Set('scala_sbtserver_address', '127.0.0.1:4273')
+call ale#Set('scala_sbtserver_project_root', '')
+
+function! ale_linters#scala#sbtserver#GetProjectRoot(buffer) abort
+    let l:project_root = ale#Var(a:buffer, 'scala_sbtserver_project_root')
+
+    if l:project_root is? ''
+        let l:project_root = ale#path#FindNearestFile(a:buffer, 'build.sbt')
+
+        return !empty(l:project_root) ? fnamemodify(l:project_root, ':h') : ''
+    endif
+
+    return l:project_root
+endfunction
+
+function! ale_linters#scala#sbtserver#GetAddress(buffer) abort
+    let l:address = ale#Var(a:buffer, 'scala_sbtserver_address')
+
+    return l:address
+endfunction
+
+call ale#linter#Define('scala', {
+\   'name': 'sbtserver',
+\   'lsp': 'socket',
+\   'address_callback': 'ale_linters#scala#sbtserver#GetAddress',
+\   'language': 'scala',
+\   'project_root_callback': 'ale_linters#scala#sbtserver#GetProjectRoot',
+\})
diff --git a/ale_linters/scala/scalac.vim b/ale_linters/scala/scalac.vim
index 551284af..ba105927 100644
--- a/ale_linters/scala/scalac.vim
+++ b/ale_linters/scala/scalac.vim
@@ -2,29 +2,14 @@
 "         w0rp <devw0rp@gmail.com>
 " Description: Basic scala support using scalac
 
-function! ale_linters#scala#scalac#GetExecutable(buffer) abort
-    if index(split(getbufvar(a:buffer, '&filetype'), '\.'), 'sbt') >= 0
-        " Don't check sbt files
-        return ''
-    endif
-
-    return 'scalac'
-endfunction
-
-function! ale_linters#scala#scalac#GetCommand(buffer) abort
-    let l:executable = ale_linters#scala#scalac#GetExecutable(a:buffer)
-
-    if empty(l:executable)
-        return ''
-    endif
-
-    return ale#Escape(l:executable) . ' -Ystop-after:parser %t'
+function! s:IsSbt(buffer) abort
+    return index(split(getbufvar(a:buffer, '&filetype'), '\.'), 'sbt') >= 0
 endfunction
 
 call ale#linter#Define('scala', {
 \   'name': 'scalac',
-\   'executable_callback': 'ale_linters#scala#scalac#GetExecutable',
-\   'command_callback': 'ale_linters#scala#scalac#GetCommand',
+\   'executable_callback': {buf -> s:IsSbt(buf) ? '' : 'scalac'},
+\   'command': '%e -Ystop-before:jvm %t',
 \   'callback': 'ale#handlers#scala#HandleScalacLintFormat',
 \   'output_stream': 'stderr',
 \})
diff --git a/ale_linters/scala/scalastyle.vim b/ale_linters/scala/scalastyle.vim
index 3232d70b..42228cf6 100644
--- a/ale_linters/scala/scalastyle.vim
+++ b/ale_linters/scala/scalastyle.vim
@@ -53,12 +53,14 @@ function! ale_linters#scala#scalastyle#GetCommand(buffer) abort
     \   'scalastyle_config.xml',
     \   'scalastyle-config.xml'
     \]
+
     for l:config in l:potential_configs
         let l:scalastyle_config = ale#path#ResolveLocalPath(
         \   a:buffer,
         \   l:config,
         \   ''
         \)
+
         if !empty(l:scalastyle_config)
             break
         endif