From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Jun 2016 16:11:56 +0200 Subject: Fix submodules --- vim/bundle/syntastic | 1 + vim/bundle/syntastic/syntax_checkers/scala/fsc.vim | 48 -------------- .../syntastic/syntax_checkers/scala/scalac.vim | 43 ------------ .../syntastic/syntax_checkers/scala/scalastyle.vim | 77 ---------------------- 4 files changed, 1 insertion(+), 168 deletions(-) create mode 160000 vim/bundle/syntastic delete mode 100644 vim/bundle/syntastic/syntax_checkers/scala/fsc.vim delete mode 100644 vim/bundle/syntastic/syntax_checkers/scala/scalac.vim delete mode 100644 vim/bundle/syntastic/syntax_checkers/scala/scalastyle.vim (limited to 'vim/bundle/syntastic/syntax_checkers/scala') diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic new file mode 160000 index 0000000..cee74e0 --- /dev/null +++ b/vim/bundle/syntastic @@ -0,0 +1 @@ +Subproject commit cee74e0c1af934065fd1b3046e53cda76574f703 diff --git a/vim/bundle/syntastic/syntax_checkers/scala/fsc.vim b/vim/bundle/syntastic/syntax_checkers/scala/fsc.vim deleted file mode 100644 index 25d6a4d..0000000 --- a/vim/bundle/syntastic/syntax_checkers/scala/fsc.vim +++ /dev/null @@ -1,48 +0,0 @@ -"============================================================================ -"File: fsc.vim -"Description: Syntax checking plugin for syntastic.vim -"Maintainer: Gregor Uhlenheuer -"License: This program is free software. It comes without any warranty, -" to the extent permitted by applicable law. You can redistribute -" it and/or modify it under the terms of the Do What The Fuck You -" Want To Public License, Version 2, as published by Sam Hocevar. -" See http://sam.zoy.org/wtfpl/COPYING for more details. -" -"============================================================================ - -if exists('g:loaded_syntastic_scala_fsc_checker') - finish -endif -let g:loaded_syntastic_scala_fsc_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_scala_fsc_GetLocList() dict - call syntastic#log#deprecationWarn('scala_options', 'scala_fsc_args') - - " fsc has some serious problems with the - " working directory changing after being started - " that's why we better pass an absolute path - let makeprg = self.makeprgBuild({ - \ 'args_after': '-Ystop-after:parser', - \ 'fname': syntastic#util#shexpand('%:p') }) - - let errorformat = - \ '%E%f:%l: %trror: %m,' . - \ '%Z%p^,' . - \ '%-G%.%#' - - return SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat }) -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'scala', - \ 'name': 'fsc'}) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: diff --git a/vim/bundle/syntastic/syntax_checkers/scala/scalac.vim b/vim/bundle/syntastic/syntax_checkers/scala/scalac.vim deleted file mode 100644 index 854876b..0000000 --- a/vim/bundle/syntastic/syntax_checkers/scala/scalac.vim +++ /dev/null @@ -1,43 +0,0 @@ -"============================================================================ -"File: scala.vim -"Description: Syntax checking plugin for syntastic.vim -"Maintainer: Rickey Visinski -"License: This program is free software. It comes without any warranty, -" to the extent permitted by applicable law. You can redistribute -" it and/or modify it under the terms of the Do What The Fuck You -" Want To Public License, Version 2, as published by Sam Hocevar. -" See http://sam.zoy.org/wtfpl/COPYING for more details. -" -"============================================================================ - -if exists('g:loaded_syntastic_scala_scalac_checker') - finish -endif -let g:loaded_syntastic_scala_scalac_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_scala_scalac_GetLocList() dict - call syntastic#log#deprecationWarn('scala_options', 'scala_scalac_args') - - let makeprg = self.makeprgBuild({ 'args_after': '-Ystop-after:parser' }) - - let errorformat = - \ '%E%f:%l: %trror: %m,' . - \ '%Z%p^,' . - \ '%-G%.%#' - - return SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat }) -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'scala', - \ 'name': 'scalac'}) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: diff --git a/vim/bundle/syntastic/syntax_checkers/scala/scalastyle.vim b/vim/bundle/syntastic/syntax_checkers/scala/scalastyle.vim deleted file mode 100644 index 60d2163..0000000 --- a/vim/bundle/syntastic/syntax_checkers/scala/scalastyle.vim +++ /dev/null @@ -1,77 +0,0 @@ -"============================================================================ -"File: scalastyle.vim -"Description: Syntax checking plugin for syntastic.vim -"Maintainer: LCD 47 -"License: This program is free software. It comes without any warranty, -" to the extent permitted by applicable law. You can redistribute -" it and/or modify it under the terms of the Do What The Fuck You -" Want To Public License, Version 2, as published by Sam Hocevar. -" See http://sam.zoy.org/wtfpl/COPYING for more details. -" -"============================================================================ - -if exists('g:loaded_syntastic_scala_scalastyle_checker') - finish -endif -let g:loaded_syntastic_scala_scalastyle_checker = 1 - -if !exists('g:syntastic_scala_scalastyle_jar') - let g:syntastic_scala_scalastyle_jar = 'scalastyle-batch_2.10.jar' -endif - -if !exists('g:syntastic_scala_scalastyle_config_file') - let g:syntastic_scala_scalastyle_config_file = 'scalastyle_config.xml' -endif - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_scala_scalastyle_IsAvailable() dict - if !executable(self.getExec()) - return 0 - endif - - let jar = expand(g:syntastic_scala_scalastyle_jar, 1) - let conf_file = expand(g:syntastic_scala_scalastyle_config_file, 1) - call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar) . ', ' . - \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file)) - - return filereadable(jar) && filereadable(conf_file) -endfunction - -function! SyntaxCheckers_scala_scalastyle_GetLocList() dict - - let makeprg = self.makeprgBuild({ - \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar, 1)], - \ 'args_before': ['-c', expand(g:syntastic_scala_scalastyle_config_file, 1)] }) - - let errorformat = - \ '%trror file=%f message=%m line=%l column=%c,' . - \ '%trror file=%f message=%m line=%l,' . - \ '%tarning file=%f message=%m line=%l column=%c,' . - \ '%tarning file=%f message=%m line=%l' - - let loclist = SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat, - \ 'subtype': 'Style', - \ 'returns': [0, 1] }) - - for e in loclist - if has_key(e, 'col') - let e['col'] += 1 - endif - endfor - - return loclist -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'scala', - \ 'name': 'scalastyle', - \ 'exec': 'java'}) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: -- cgit v1.2.3