summaryrefslogtreecommitdiff
path: root/ale_linters
diff options
context:
space:
mode:
authorNils Leuzinger <nilsl@student.ethz.ch>2018-04-05 21:04:11 +0200
committerw0rp <w0rp@users.noreply.github.com>2018-04-05 21:04:11 +0200
commit912f632bf591377a69bf688f6a85668d93be8841 (patch)
tree2a970b78998ca400551c7ef7d025826f9207db76 /ale_linters
parenta2acdecbc2d03fbf03e74835086532b62e60665c (diff)
downloadale-912f632bf591377a69bf688f6a85668d93be8841.zip
Add fsc linter for Scala (#1452)
* Add fsc as a Scala linter * Pull reused code into `autoload/ale/` directory * Include fsc into the README * Add unit test for testing the scala handler * Add unit test for scala's fsc linter * Rename scala unit tests for clarity * Fix typo in README * Fix typos in doc/ale.txt * Fix author headline * Put methods for fsc commands back into fsc.vim * Move command_callback tests to correct location * Rewrite handler test so it actually tests handler * Clarify description of test in test_scala_handler
Diffstat (limited to 'ale_linters')
-rw-r--r--ale_linters/scala/fsc.vim29
-rw-r--r--ale_linters/scala/scalac.vim39
2 files changed, 31 insertions, 37 deletions
diff --git a/ale_linters/scala/fsc.vim b/ale_linters/scala/fsc.vim
new file mode 100644
index 00000000..17b26f0b
--- /dev/null
+++ b/ale_linters/scala/fsc.vim
@@ -0,0 +1,29 @@
+" 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'
+endfunction
+
+call ale#linter#Define('scala', {
+\ 'name': 'fsc',
+\ 'executable_callback': 'ale_linters#scala#fsc#GetExecutable',
+\ 'command_callback': 'ale_linters#scala#fsc#GetCommand',
+\ 'callback': 'ale#handlers#scala#HandleScalacLintFormat',
+\ 'output_stream': 'stderr',
+\})
diff --git a/ale_linters/scala/scalac.vim b/ale_linters/scala/scalac.vim
index 584aee74..551284af 100644
--- a/ale_linters/scala/scalac.vim
+++ b/ale_linters/scala/scalac.vim
@@ -4,7 +4,7 @@
function! ale_linters#scala#scalac#GetExecutable(buffer) abort
if index(split(getbufvar(a:buffer, '&filetype'), '\.'), 'sbt') >= 0
- " Don't check sbt files with scalac.
+ " Don't check sbt files
return ''
endif
@@ -21,45 +21,10 @@ function! ale_linters#scala#scalac#GetCommand(buffer) abort
return ale#Escape(l:executable) . ' -Ystop-after:parser %t'
endfunction
-function! ale_linters#scala#scalac#Handle(buffer, lines) abort
- " Matches patterns line the following:
- "
- " /var/folders/5q/20rgxx3x1s34g3m14n5bq0x80000gn/T/vv6pSsy/0:26: error: expected class or object definition
- let l:pattern = '^.\+:\(\d\+\): \(\w\+\): \(.\+\)'
- let l:output = []
- let l:ln = 0
-
- for l:line in a:lines
- let l:ln = l:ln + 1
- let l:match = matchlist(l:line, l:pattern)
-
- if len(l:match) == 0
- continue
- endif
-
- let l:text = l:match[3]
- let l:type = l:match[2] is# 'error' ? 'E' : 'W'
- let l:col = 0
-
- if l:ln + 1 < len(a:lines)
- let l:col = stridx(a:lines[l:ln + 1], '^')
- endif
-
- call add(l:output, {
- \ 'lnum': l:match[1] + 0,
- \ 'col': l:col + 1,
- \ 'text': l:text,
- \ 'type': l:type,
- \})
- endfor
-
- return l:output
-endfunction
-
call ale#linter#Define('scala', {
\ 'name': 'scalac',
\ 'executable_callback': 'ale_linters#scala#scalac#GetExecutable',
\ 'command_callback': 'ale_linters#scala#scalac#GetCommand',
-\ 'callback': 'ale_linters#scala#scalac#Handle',
+\ 'callback': 'ale#handlers#scala#HandleScalacLintFormat',
\ 'output_stream': 'stderr',
\})