Checker solium: cleanup.

vim-syntastic · Mar 16, 2017 · e0d044f · e0d044f
1 parent 08ca849
commit e0d044f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/doc/syntastic-checkers.txt b/doc/syntastic-checkers.txt
@@ -5970,7 +5970,7 @@ SYNTAX CHECKERS FOR SOLIDITY                     *syntastic-checkers-solidity*
 The following checkers are available for Solidity (filetype "solidity"):
 
     1. solc.....................|syntastic-solidity-solc|
-    1. solium...................|syntastic-solidity-solium|
+    2. Solium...................|syntastic-solidity-solium|
 
 ------------------------------------------------------------------------------
 1. solc                                              *syntastic-solidity-solc*
@@ -5996,27 +5996,19 @@ You probably also need a plugin to set |filetype| for Solidity files, such as
     https://github.com/tomlion/vim-solidity
 
 ------------------------------------------------------------------------------
-1. solium                                          *syntastic-solidity-solium*
+2. Solium                                          *syntastic-solidity-solium*
 
 Name:        solium
 Maintainer:  Matthijs van den Bos <matthijs@vandenbos.org>
 
-Solium is a linter for Solidity which uses Abstract Syntax Trees and allows
-the user to enable/disable existing rules and add their own ones. See the 
-project's page for details:
+"Solium" is a linter for "Solidity" files. See the project's page for details:
 
     https://github.com/duaraghav8/Solium
 
 Checker options~
 
-This checker is configured by the .soliumrc.json file.
-
-Note
-
-Solium doesn't run without a .soliumrc.json in the directory where it is run
-from. In the case of this checker, that is the directory where the file being
-checked is located. If there is no .soliumrc.json there, the checker won't
-work.
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
 
 Note~
 

diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.8.0-30'
+let g:_SYNTASTIC_VERSION = '3.8.0-33'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1

diff --git a/plugin/syntastic/registry.vim b/plugin/syntastic/registry.vim
@@ -86,7 +86,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'slim':          ['slimrb'],
         \ 'sml':           ['smlnj'],
         \ 'spec':          ['rpmlint'],
-        \ 'solidity':      ['solc', 'solium'],
+        \ 'solidity':      ['solc'],
         \ 'sql':           ['sqlint'],
         \ 'stylus':        ['stylint'],
         \ 'tcl':           ['nagelfar'],

diff --git a/syntax_checkers/solidity/solium.vim b/syntax_checkers/solidity/solium.vim
@@ -20,15 +20,17 @@ set cpo&vim
 
 function! SyntaxCheckers_solidity_solium_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe': 'solium',
-        \ 'fname': expand('%:p',1),
-        \ 'args': '-R gcc --file'})
+        \ 'args_after': '-R gcc',
+        \ 'fname_before': '--file'})
 
-    let errorformat = '%f:%l:%c: %trror: %m'
+    let errorformat =
+        \ '%f:%l:%c: %trror: %m,' .
+        \ '%f:%l:%c: %tarning: %m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({