From 912f632bf591377a69bf688f6a85668d93be8841 Mon Sep 17 00:00:00 2001 From: Nils Leuzinger Date: Thu, 5 Apr 2018 21:04:11 +0200 Subject: 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 --- ale_linters/scala/scalac.vim | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'ale_linters/scala/scalac.vim') 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', \}) -- cgit v1.2.3