From 7a0f2d974f9ac5bc85607e8c769d3370dd18ac74 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 7 Dec 2019 12:21:37 +0100
Subject: Update

---
 autoload/cargo.vim | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'autoload/cargo.vim')

diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index f24db923..ffa946da 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -5,7 +5,17 @@ function! cargo#Load()
 endfunction
 
 function! cargo#cmd(args)
-    execute "! cargo" a:args
+    " Trim trailing spaces. This is necessary since :terminal command parses
+    " trailing spaces as an empty argument.
+    let args = substitute(a:args, '\s\+$', '', '')
+    if has('terminal')
+        let cmd = 'terminal'
+    elseif has('nvim')
+        let cmd = 'noautocmd new | terminal'
+    else
+        let cmd = '!'
+    endif
+    execute cmd 'cargo' args
 endfunction
 
 function! s:nearest_cargo(...) abort
-- 
cgit v1.2.3