user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added check for absolute file path, removed hard tab, and added documentation for new option.

Browse source
This commit is contained in:
Damien Radtke 2014-11-04 14:08:57 -06:00
parent 0207e25d70
commit 75e4d95838
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/etc/vim/compiler/cargo.vim
View file

@ -23,9 +23,13 @@ endif
" support variations like 'cargo.toml'.
let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
function! s:is_absolute(path)
return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
endfunction
let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
if s:local_manifest != ''
let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
augroup cargo
au!
au QuickfixCmdPost make call s:FixPaths()
@ -43,14 +47,14 @@ if s:local_manifest != ''
let manifest = m[1].'/'
" Manually strip another slash if needed; usually just an
" issue on Windows.
if manifest =~ '^/[A-Z]:/'
if manifest =~ '^/[A-Z]\+:/'
let manifest = manifest[1:]
endif
endif
continue
endif
let filename = bufname(qf.bufnr)
if filereadable(filename)
if s:is_absolute(filename)
continue
endif
let qf.filename = simplify(manifest.filename)

7
src/etc/vim/doc/rust.txt
View file

@ -79,6 +79,13 @@ g:ftplugin_rust_source_path~
let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
<
*g:cargo_manifest_name*
g:cargo_manifest_name~
Set this option to the name of the manifest file for your projects. If
not specified it defaults to 'Cargo.toml' : >
let g:cargo_manifest_name = 'Cargo.toml'
<
==============================================================================
COMMANDS *rust-commands*