diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2017-09-27 19:57:29 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2017-09-27 19:57:29 +0200 |
| commit | 8b3418cab8eb5267b3a5743e4d5fe5f698d48bc8 (patch) | |
| tree | 125734ac66307a962eeda16283355dde0d0fbd2e /compiler | |
| parent | 9bfde7574aa89a91b80ed9c993fc000cfc11aae7 (diff) | |
| download | vim-polyglot-8b3418cab8eb5267b3a5743e4d5fe5f698d48bc8.tar.gz vim-polyglot-8b3418cab8eb5267b3a5743e4d5fe5f698d48bc8.zip | |
Update
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cargo.vim | 19 | ||||
| -rw-r--r-- | compiler/rake.vim | 8 | ||||
| -rw-r--r-- | compiler/rustc.vim | 3 | ||||
| -rw-r--r-- | compiler/typescript.vim | 12 |
4 files changed, 31 insertions, 11 deletions
diff --git a/compiler/cargo.vim b/compiler/cargo.vim index 160d214e..8e3c6212 100644 --- a/compiler/cargo.vim +++ b/compiler/cargo.vim @@ -4,21 +4,25 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1 " Compiler: Cargo Compiler " Maintainer: Damien Radtke <damienradtke@gmail.com> " Latest Revision: 2014 Sep 24 +" For bugs, patches and license go to https://github.com/rust-lang/rust.vim if exists('current_compiler') - finish + finish endif runtime compiler/rustc.vim let current_compiler = "cargo" +let s:save_cpo = &cpo +set cpo&vim + if exists(':CompilerSet') != 2 - command -nargs=* CompilerSet setlocal <args> + command -nargs=* CompilerSet setlocal <args> endif if exists('g:cargo_makeprg_params') - execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*' + execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*' else - CompilerSet makeprg=cargo\ $* + CompilerSet makeprg=cargo\ $* endif " Ignore general cargo progress messages @@ -27,6 +31,11 @@ CompilerSet errorformat+= \%-G%\\s%#Compiling%.%#, \%-G%\\s%#Finished%.%#, \%-G%\\s%#error:\ Could\ not\ compile\ %.%#, - \%-G%\\s%#To\ learn\ more\\,%.%# + \%-G%\\s%#To\ learn\ more\\,%.%#, + \%-Gnote:\ Run\ with\ \`RUST_BACKTRACE=%.%#, + \%.%#panicked\ at\ \\'%m\\'\\,\ %f:%l + +let &cpo = s:save_cpo +unlet s:save_cpo endif diff --git a/compiler/rake.vim b/compiler/rake.vim index 3ed1472b..e304f8fa 100644 --- a/compiler/rake.vim +++ b/compiler/rake.vim @@ -24,10 +24,10 @@ CompilerSet errorformat= \%D(in\ %f), \%\\s%#from\ %f:%l:%m, \%\\s%#from\ %f:%l:, - \%\\s%##\ %f:%l:%m%\\&%.%#%\\D:%.%#, - \%\\s%##\ %f:%l%\\&%.%#%\\D:%.%#, - \%\\s%#[%f:%l:\ %#%m%\\&%.%#%\\D:%.%#, - \%\\s%#%f:%l:\ %#%m%\\&%.%#%\\D:%.%#, + \%\\s%##\ %f:%l:%m%\\&%.%#%\\D:%\\d%#:%.%#, + \%\\s%##\ %f:%l%\\&%.%#%\\D:%\\d%#, + \%\\s%#[%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%#:%.%#, + \%\\s%#%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%#:%.%#, \%\\s%#%f:%l:, \%m\ [%f:%l]:, \%+Erake\ aborted!, diff --git a/compiler/rustc.vim b/compiler/rustc.vim index 5c02dd28..7b691b31 100644 --- a/compiler/rustc.vim +++ b/compiler/rustc.vim @@ -4,9 +4,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1 " Compiler: Rust Compiler " Maintainer: Chris Morgan <me@chrismorgan.info> " Latest Revision: 2013 Jul 12 +" For bugs, patches and license go to https://github.com/rust-lang/rust.vim if exists("current_compiler") - finish + finish endif let current_compiler = "rustc" diff --git a/compiler/typescript.vim b/compiler/typescript.vim index b4137943..9ba313fe 100644 --- a/compiler/typescript.vim +++ b/compiler/typescript.vim @@ -17,8 +17,18 @@ if exists(":CompilerSet") != 2 command! -nargs=* CompilerSet setlocal <args> endif -let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $* %' +let s:cpo_save = &cpo +set cpo-=C + +execute 'CompilerSet makeprg=' + \ . escape(g:typescript_compiler_binary, ' ') + \ . '\ ' + \ . escape(g:typescript_compiler_options, ' ') + \ . '\ $*\ %' CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m +let &cpo = s:cpo_save +unlet s:cpo_save + endif |