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 + .../syntax_checkers/erlang/erlang_check_file.erl | 95 ---------------------- .../syntastic/syntax_checkers/erlang/escript.vim | 61 -------------- .../syntastic/syntax_checkers/erlang/syntaxerl.vim | 42 ---------- 4 files changed, 1 insertion(+), 198 deletions(-) create mode 160000 vim/bundle/syntastic delete mode 100755 vim/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl delete mode 100644 vim/bundle/syntastic/syntax_checkers/erlang/escript.vim delete mode 100644 vim/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim (limited to 'vim/bundle/syntastic/syntax_checkers/erlang') 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/erlang/erlang_check_file.erl b/vim/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl deleted file mode 100755 index 730e600..0000000 --- a/vim/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env escript - -main([File]) -> - Dir = get_root(filename:dirname(File)), - Defs = [strong_validation, - warn_export_all, - warn_export_vars, - warn_shadow_vars, - warn_obsolete_guard, - warn_unused_import, - report, - {i, Dir ++ "/include"}], - %% `rebar.config` is looked for, - %% but it is not necessarily the one in the project root. - %% I.e. it may be one deeper in the project file hierarchy. - RebarFile = rebar_file(Dir), - %% `rebar.config` might contain relative paths. - %% They are relative to the file! Not to the project root. - RebarOpts = rebar_opts(Dir ++ "/" ++ RebarFile), - code:add_patha(filename:absname("ebin")), - %% `compile:file/2` requires the `{i, Path}` to be relative - %% to CWD - no surprise here. - compile:file(File, Defs ++ translate_paths(Dir, RebarOpts)); - -main(_) -> - io:format("Usage: ~s ~n", [escript:script_name()]), - halt(1). - -rebar_file(Dir) -> - DirList = filename:split(Dir), - case lists:last(DirList) of - "test" -> - "rebar.test.config"; - _ -> - "rebar.config" - end. - -rebar_opts(RebarFile) -> - Dir = get_root(filename:dirname(RebarFile)), - case file:consult(RebarFile) of - {ok, Terms} -> - RebarLibDirs = proplists:get_value(lib_dirs, Terms, []), - lists:foreach( - fun(LibDir) -> - code:add_pathsa(filelib:wildcard(LibDir ++ "/*/ebin")) - end, RebarLibDirs), - RebarDepsDir = proplists:get_value(deps_dir, Terms, "deps"), - code:add_pathsa(filelib:wildcard(RebarDepsDir ++ "/*/ebin")), - IncludeDeps = {i, filename:join(Dir, RebarDepsDir)}, - proplists:get_value(erl_opts, Terms, []) ++ [IncludeDeps]; - {error, _} when RebarFile == "rebar.config" -> - fallback_opts(); - {error, _} -> - rebar_opts("rebar.config") - end. - -fallback_opts() -> - code:add_pathsa(filelib:wildcard("deps/*/ebin")), - code:add_pathsa(nested_app_ebins()), - [ - { i, filename:absname("apps") }, { i, filename:absname("deps") } | [ { i, filename:absname(Path) } || Path <- filelib:wildcard("deps/*/apps")] - ]. - -nested_app_ebins() -> - DetectedAppSrcFiles = filelib:wildcard("deps/*/apps/**/*.app.src"), - [apps_dir_from_src(AppSrcFile)||AppSrcFile<-DetectedAppSrcFiles]. - -apps_dir_from_src(SrcFile) -> - SrcDir = filename:dirname(SrcFile), - filename:join(SrcDir, "../../ebin"). - -get_root(Dir) -> - Path = filename:split(filename:absname(Dir)), - filename:join(get_root(lists:reverse(Path), Path)). - -get_root([], Path) -> - Path; -get_root(["src" | Tail], _Path) -> - lists:reverse(Tail); -get_root(["test" | Tail], _Path) -> - lists:reverse(Tail); -get_root([_ | Tail], Path) -> - get_root(Tail, Path). - -translate_paths(Dir, RebarOpts) -> - [ translate_path(Dir, Opt) || Opt <- RebarOpts ]. - -translate_path(Dir, {i, Path}) -> - case Path of - %% absolute - "/" ++ _ -> {i, Path}; - %% relative -> make absolute taking rebar.config location into account - _ -> {i, filename:join([Dir, Path])} - end; -translate_path(_, Other) -> Other. diff --git a/vim/bundle/syntastic/syntax_checkers/erlang/escript.vim b/vim/bundle/syntastic/syntax_checkers/erlang/escript.vim deleted file mode 100644 index 9fd869f..0000000 --- a/vim/bundle/syntastic/syntax_checkers/erlang/escript.vim +++ /dev/null @@ -1,61 +0,0 @@ -"============================================================================ -"File: erlang.vim -"Description: Syntax checking plugin for syntastic.vim -"Maintainer: Pawel Salata -"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_erlang_erlang_checker') - finish -endif -let g:loaded_syntastic_erlang_erlang_checker = 1 - -if !exists('g:syntastic_erlc_include_path') - let g:syntastic_erlc_include_path = '' -endif - -let s:check_file = syntastic#util#shescape(expand(':p:h', 1) . syntastic#util#Slash() . 'erlang_check_file.erl') - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_erlang_escript_GetLocList() dict - if expand('%:e', 1) ==# 'hrl' - return [] - endif - - let shebang = syntastic#util#parseShebang() - if shebang['exe'] ==# 'escript' - let args = '-s' - let post_args = '' - else - let args = s:check_file - let post_args = g:syntastic_erlc_include_path - endif - let makeprg = self.makeprgBuild({ - \ 'args_after': args, - \ 'fname': syntastic#util#shexpand('%:p'), - \ 'post_args_after': post_args }) - - let errorformat = - \ '%W%f:%l: warning: %m,'. - \ '%E%f:%l: %m' - - return SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat }) -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'erlang', - \ 'name': 'escript'}) - -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/erlang/syntaxerl.vim b/vim/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim deleted file mode 100644 index 45f4735..0000000 --- a/vim/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim +++ /dev/null @@ -1,42 +0,0 @@ -"============================================================================ -"File: syntaxerl.vim -"Description: Syntax checking plugin for syntastic. -"Maintainer: locojay -"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_erlang_syntaxerl_checker') - finish -endif - -let g:loaded_syntastic_erlang_syntaxerl_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - - -function! SyntaxCheckers_erlang_syntaxerl_GetLocList() dict - - let makeprg = self.makeprgBuild({}) - - let errorformat = - \ '%W%f:%l: warning: %m,'. - \ '%E%f:%l: %m' - - return SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat }) -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'erlang', - \ 'name': 'syntaxerl'}) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: -- cgit v1.2.3