diff options
Diffstat (limited to 'ale_linters')
| -rw-r--r-- | ale_linters/crystal/crystal.vim | 30 | ||||
| -rw-r--r-- | ale_linters/handlebars/embertemplatelint.vim | 10 | ||||
| -rw-r--r-- | ale_linters/haskell/hlint.vim | 8 | ||||
| -rw-r--r-- | ale_linters/ruby/brakeman.vim | 14 | ||||
| -rw-r--r-- | ale_linters/ruby/rails_best_practices.vim | 10 | ||||
| -rw-r--r-- | ale_linters/ruby/reek.vim | 15 | ||||
| -rw-r--r-- | ale_linters/typescript/tslint.vim | 6 |
7 files changed, 21 insertions, 72 deletions
diff --git a/ale_linters/crystal/crystal.vim b/ale_linters/crystal/crystal.vim index fd076e02..81579d63 100644 --- a/ale_linters/crystal/crystal.vim +++ b/ale_linters/crystal/crystal.vim @@ -4,31 +4,21 @@ function! ale_linters#crystal#crystal#Handle(buffer, lines) abort let l:output = [] - let l:lines = join(a:lines, '') - - if !empty(l:lines) - let l:errors = json_decode(l:lines) - - for l:error in l:errors - call add(l:output, { - \ 'bufnr': a:buffer, - \ 'lnum': l:error.line + 0, - \ 'col': l:error.column + 0, - \ 'text': l:error.message, - \ 'type': 'E', - \}) - endfor - endif + for l:error in ale#util#FuzzyJSONDecode(a:lines, []) + call add(l:output, { + \ 'lnum': l:error.line + 0, + \ 'col': l:error.column + 0, + \ 'text': l:error.message, + \}) + endfor return l:output endfunction function! ale_linters#crystal#crystal#GetCommand(buffer) abort - let l:crystal_cmd = 'crystal build -f json --no-codegen --no-color -o ' - let l:crystal_cmd .= ale#Escape(g:ale#util#nul_file) - let l:crystal_cmd .= ' %s' - - return l:crystal_cmd + return 'crystal build -f json --no-codegen --no-color -o ' + \ . ale#Escape(g:ale#util#nul_file) + \ . ' %s' endfunction call ale#linter#Define('crystal', { diff --git a/ale_linters/handlebars/embertemplatelint.vim b/ale_linters/handlebars/embertemplatelint.vim index e7fa149c..963ab568 100644 --- a/ale_linters/handlebars/embertemplatelint.vim +++ b/ale_linters/handlebars/embertemplatelint.vim @@ -16,16 +16,10 @@ function! ale_linters#handlebars#embertemplatelint#GetCommand(buffer) abort endfunction function! ale_linters#handlebars#embertemplatelint#Handle(buffer, lines) abort - if len(a:lines) == 0 - return [] - endif - let l:output = [] + let l:json = ale#util#FuzzyJSONDecode(a:lines, {}) - let l:input_json = json_decode(join(a:lines, '')) - let l:file_errors = values(l:input_json)[0] - - for l:error in l:file_errors + for l:error in get(values(l:json), 0, []) if has_key(l:error, 'fatal') call add(l:output, { \ 'bufnr': a:buffer, diff --git a/ale_linters/haskell/hlint.vim b/ale_linters/haskell/hlint.vim index accae374..91e65123 100644 --- a/ale_linters/haskell/hlint.vim +++ b/ale_linters/haskell/hlint.vim @@ -2,15 +2,9 @@ " Description: hlint for Haskell files function! ale_linters#haskell#hlint#Handle(buffer, lines) abort - if empty(a:lines) - return [] - endif - - let l:errors = json_decode(join(a:lines, '')) - let l:output = [] - for l:error in l:errors + for l:error in ale#util#FuzzyJSONDecode(a:lines, []) if l:error.severity ==# 'Error' let l:type = 'E' elseif l:error.severity ==# 'Suggestion' diff --git a/ale_linters/ruby/brakeman.vim b/ale_linters/ruby/brakeman.vim index 565c8c70..0070c15c 100644 --- a/ale_linters/ruby/brakeman.vim +++ b/ale_linters/ruby/brakeman.vim @@ -5,20 +5,10 @@ let g:ale_ruby_brakeman_options = \ get(g:, 'ale_ruby_brakeman_options', '') function! ale_linters#ruby#brakeman#Handle(buffer, lines) abort - if len(a:lines) == 0 - return [] - endif - - try - let l:result = json_decode(join(a:lines, '')) - catch /E474/ - " Ignore invalid JSON - return [] - endtry - let l:output = [] + let l:json = ale#util#FuzzyJSONDecode(a:lines, {}) - for l:warning in l:result.warnings + for l:warning in get(l:json, 'warnings', []) " Brakeman always outputs paths relative to the Rails app root let l:rails_root = ale#ruby#FindRailsRoot(a:buffer) let l:warning_file = l:rails_root . '/' . l:warning.file diff --git a/ale_linters/ruby/rails_best_practices.vim b/ale_linters/ruby/rails_best_practices.vim index a3d9f7a2..503a115c 100644 --- a/ale_linters/ruby/rails_best_practices.vim +++ b/ale_linters/ruby/rails_best_practices.vim @@ -5,17 +5,11 @@ let g:ale_ruby_rails_best_practices_options = \ get(g:, 'ale_ruby_rails_best_practices_options', '') function! ale_linters#ruby#rails_best_practices#Handle(buffer, lines) abort - if len(a:lines) == 0 - return [] - endif - - let l:result = json_decode(join(a:lines, '')) - let l:output = [] - for l:warning in l:result + for l:warning in ale#util#FuzzyJSONDecode(a:lines, []) if !ale#path#IsBufferPath(a:buffer, l:warning.filename) - continue + continue endif call add(l:output, { diff --git a/ale_linters/ruby/reek.vim b/ale_linters/ruby/reek.vim index 5f476fb1..10bc9a84 100644 --- a/ale_linters/ruby/reek.vim +++ b/ale_linters/ruby/reek.vim @@ -1,22 +1,13 @@ " Author: Eddie Lebow https://github.com/elebow " Description: Reek, a code smell detector for Ruby files -let g:ale_ruby_reek_show_context = -\ get(g:, 'ale_ruby_reek_show_context', 0) - -let g:ale_ruby_reek_show_wiki_link = -\ get(g:, 'ale_ruby_reek_show_wiki_link', 0) +call ale#Set('ruby_reek_show_context', 0) +call ale#Set('ruby_reek_show_wiki_link', 0) function! ale_linters#ruby#reek#Handle(buffer, lines) abort - if len(a:lines) == 0 - return [] - endif - - let l:errors = json_decode(a:lines[0]) - let l:output = [] - for l:error in l:errors + for l:error in ale#util#FuzzyJSONDecode(a:lines, []) for l:location in l:error.lines call add(l:output, { \ 'lnum': l:location, diff --git a/ale_linters/typescript/tslint.vim b/ale_linters/typescript/tslint.vim index e9b31644..7cd1cb4b 100644 --- a/ale_linters/typescript/tslint.vim +++ b/ale_linters/typescript/tslint.vim @@ -14,11 +14,7 @@ endfunction function! ale_linters#typescript#tslint#Handle(buffer, lines) abort let l:output = [] - if empty(a:lines) - return [] - endif - - for l:error in json_decode(join(a:lines, '')) + for l:error in ale#util#FuzzyJSONDecode(a:lines, []) if ale#path#IsBufferPath(a:buffer, l:error.name) call add(l:output, { \ 'type': (get(l:error, 'ruleSeverity', '') ==# 'WARNING' ? 'W' : 'E'), |