From c770ef44b9a452aaeaea5f311a6b9c57e66769ea Mon Sep 17 00:00:00 2001 From: Kiyoshi '13k' Murata Date: Mon, 21 May 2018 13:25:27 -0300 Subject: [PATCH 1/2] Check shell return code in addition to output --- autoload/rufo.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/rufo.vim b/autoload/rufo.vim index b800d96..d3a5f32 100644 --- a/autoload/rufo.vim +++ b/autoload/rufo.vim @@ -63,11 +63,11 @@ function! s:format(start_line, end_line) abort let l:selection = join(map(getline(a:start_line, a:end_line), "escape(v:val, '\\')"), '\n') let l:out = systemlist('echo ' . shellescape(l:selection) . '| rufo') - return [s:formatting_failed(l:out), l:out] + return [s:formatting_failed(v:shell_error, l:out), l:out] endf -function! s:formatting_failed(message) abort - return a:message[0] =~ 'Error' +function! s:formatting_failed(status, message) abort + return (a:status && a:status != 3) || a:message[0] =~# 'Error' endf function! s:show_error(message) abort From 6a21199575cd5ce9a9e039854dc3c4c0518b8705 Mon Sep 17 00:00:00 2001 From: Kiyoshi '13k' Murata Date: Tue, 22 May 2018 11:26:18 -0300 Subject: [PATCH 2/2] Remove failure check by command output --- autoload/rufo.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/rufo.vim b/autoload/rufo.vim index d3a5f32..e8147a2 100644 --- a/autoload/rufo.vim +++ b/autoload/rufo.vim @@ -63,11 +63,11 @@ function! s:format(start_line, end_line) abort let l:selection = join(map(getline(a:start_line, a:end_line), "escape(v:val, '\\')"), '\n') let l:out = systemlist('echo ' . shellescape(l:selection) . '| rufo') - return [s:formatting_failed(v:shell_error, l:out), l:out] + return [s:formatting_failed(v:shell_error), l:out] endf -function! s:formatting_failed(status, message) abort - return (a:status && a:status != 3) || a:message[0] =~# 'Error' +function! s:formatting_failed(status) abort + return a:status && a:status != 3 endf function! s:show_error(message) abort