mirror of
https://github.com/amix/vimrc
synced 2025-06-29 02:55:01 +08:00
Updated plugins and added vim-markdown
This commit is contained in:
@ -69,6 +69,7 @@ rebar_opts(RebarFile) ->
|
||||
Dir = get_root(filename:dirname(RebarFile)),
|
||||
case file:consult(RebarFile) of
|
||||
{ok, Terms} ->
|
||||
%% Add deps for a rebar (version < 3) project
|
||||
RebarLibDirs = proplists:get_value(lib_dirs, Terms, []),
|
||||
lists:foreach(
|
||||
fun(LibDir) ->
|
||||
@ -76,8 +77,14 @@ rebar_opts(RebarFile) ->
|
||||
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];
|
||||
|
||||
%% Add deps for rebar 3
|
||||
code:add_pathsa(filelib:wildcard(Dir ++ "/_build/default/lib/*/ebin")),
|
||||
%% Add include dependencies
|
||||
IncludeDeps = [{i, IPath} || IPath <- filelib:wildcard(Dir ++ "/_build/default/lib/*")] ++
|
||||
[{i, filename:join(Dir, RebarDepsDir)}, %% rebar 2 dependencies
|
||||
{i, filename:join(Dir, "apps")}], %% rebar 3 multi-apps
|
||||
proplists:get_value(erl_opts, Terms, []) ++ IncludeDeps;
|
||||
{error, _} when RebarFile == "rebar.config" ->
|
||||
fallback_opts();
|
||||
{error, _} ->
|
||||
@ -258,12 +265,19 @@ apps_dir_from_src(SrcFile) ->
|
||||
SrcDir = filename:dirname(SrcFile),
|
||||
filename:join(SrcDir, "../../ebin").
|
||||
|
||||
%% Find the root directory of the project
|
||||
get_root(Dir) ->
|
||||
Path = filename:split(filename:absname(Dir)),
|
||||
filename:join(get_root(lists:reverse(Path), Path)).
|
||||
|
||||
get_root([], Path) ->
|
||||
Path;
|
||||
%% Strip off /apps/<appname>/src from the end of the path
|
||||
%% (rebar 3 multi-app project)
|
||||
get_root(["src", _Appname, "apps" | Tail], _Path) ->
|
||||
lists:reverse(Tail);
|
||||
%% Strip off /src or /test from the end of the path
|
||||
%% (single-app project)
|
||||
get_root(["src" | Tail], _Path) ->
|
||||
lists:reverse(Tail);
|
||||
get_root(["test" | Tail], _Path) ->
|
||||
|
@ -14,14 +14,21 @@ let s:save_cpo = &cpo
|
||||
set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_python_mypy_GetLocList() dict
|
||||
let makeprg = self.makeprgBuild({})
|
||||
if !exists('s:mypy_new')
|
||||
" creative versioning: version string has changed from v0.4.6 to v0.470
|
||||
" XXX the test should be fine for now, since 470 > 4
|
||||
let s:mypy_new = syntastic#util#versionIsAtLeast(self.getVersion(), [0, 4, 5])
|
||||
endif
|
||||
|
||||
let errorformat = '%f:%l:%m'
|
||||
let makeprg = self.makeprgBuild({ 'args_after': (s:mypy_new ? '--show-column-numbers' : '') })
|
||||
|
||||
let errorformat =
|
||||
\ '%f:%l:%c:%t:%m,' .
|
||||
\ '%f:%l:%t:%m'
|
||||
|
||||
return SyntasticMake({
|
||||
\ 'makeprg': makeprg,
|
||||
\ 'errorformat': errorformat,
|
||||
\ 'defaults': { 'type': 'E' },
|
||||
\ 'returns': [0, 1],
|
||||
\ 'preprocess': 'mypy' })
|
||||
endfunction
|
||||
|
41
sources_non_forked/syntastic/syntax_checkers/yara/yara.vim
Normal file
41
sources_non_forked/syntastic/syntax_checkers/yara/yara.vim
Normal file
@ -0,0 +1,41 @@
|
||||
"============================================================================
|
||||
"File: yara.vim
|
||||
"Description: Syntax checking plugin for syntastic
|
||||
"Maintainer: Albert Song (albb@teamt5.org)
|
||||
"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_yara_yarac_checker')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_syntastic_yara_yarac_checker = 1
|
||||
|
||||
let s:save_cpo = &cpo
|
||||
set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_yara_yarac_GetLocList() dict
|
||||
let makeprg = self.makeprgBuild({ 'fname_after' : syntastic#util#DevNull() })
|
||||
|
||||
let errorformat =
|
||||
\ '%f(%l): %trror: %m,' .
|
||||
\ '%f(%l): %tarning: %m,' .
|
||||
\ '%f(%l): %m'
|
||||
|
||||
return SyntasticMake({
|
||||
\ 'makeprg': makeprg,
|
||||
\ 'errorformat': errorformat })
|
||||
endfunction
|
||||
|
||||
call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||
\ 'filetype': 'yara',
|
||||
\ 'name': 'yarac'})
|
||||
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
||||
" vim: set sw=4 sts=4 et fdm=marker:
|
Reference in New Issue
Block a user