From 982ef2a0e12fa50d8651e5f915c05ed0b28b2324 Mon Sep 17 00:00:00 2001
From: Jerome Reybert <jreybert@gmail.com>
Date: Wed, 6 Jul 2022 23:47:53 +0200
Subject: [PATCH] more debug help
---
plugin/magit.vim | 5 ++++-
test/run.sh | 16 +++-------------
test/vimrc | 9 +++++++++
3 files changed, 16 insertions(+), 14 deletions(-)
create mode 100644 test/vimrc
diff --git a/plugin/magit.vim b/plugin/magit.vim
index 68d417c..4e69ba8 100644
--- a/plugin/magit.vim
+++ b/plugin/magit.vim
@@ -518,7 +518,10 @@ endfunction
" param[in] visible : boolean, force visible value. If not set, toggle
" visibility
function! magit#open_close_folding(...)
+ call vader#log(g:magit_file_re)
+ call vader#log(getline("."))
let list = matchlist(getline("."), g:magit_file_re)
+ call vader#log(list)
if ( empty(list) )
throw 'non file header line: ' . getline(".")
endif
@@ -1345,7 +1348,7 @@ function! magit#jump_to()
execute "edit " . "+" . line_in_file . " " filename
endif
catch
- if ( v:exception == 'Vim:Interrupt' && buf_win == 0)
+ if ( v:exception == 'Vim:Interrupt' && bufwinid(filename) != -1)
close
elseif ( v:exception != 'Vim(edit):E325: ATTENTION' )
throw "vimagit: " . v:exception
diff --git a/test/run.sh b/test/run.sh
index 8b585bc..cd7ec9f 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,6 +1,6 @@
-set -e
+set -evx
-if [[ "$VIMGAGIT_TEST_VERBOSE" == "1" ]]; then
+if [[ "$VIMAGIT_TEST_VERBOSE" == "1" ]]; then
set -x
fi
@@ -71,17 +71,7 @@ for script in ${!test_scripts[@]}; do
echo "Test $script with $filename from path $TEST_SUB_PATH and from $([ $i -eq 1 ] && echo "end" || echo "start") of line"
- $VIM -Nu <(cat << EOF
- filetype off
- set rtp-=~/.vim
- set rtp-=~/.vim/after
- set rtp+=$VIMAGIT_PATH
- set rtp+=$VADER_PATH
- let g:vader_show_version=0
- filetype plugin indent on
- syntax enable
-EOF
-) -c "Vader! $VIMAGIT_PATH/test/$script 2> >(sed -n '/^Starting Vader/,$p')"
+ $VIM -Nu test/vimrc -c "Vader! $VIMAGIT_PATH/test/$script 2> >(sed -n '/^Starting Vader/,$p')"
done
done
diff --git a/test/vimrc b/test/vimrc
new file mode 100644
index 0000000..2234d3b
--- /dev/null
+++ b/test/vimrc
@@ -0,0 +1,9 @@
+filetype off
+set rtp-=~/.vim
+set rtp-=~/.vim/after
+set rtp+=$VIMAGIT_PATH
+set rtp+=$VADER_PATH
+let g:vader_show_version=0
+filetype plugin indent on
+syntax enable
+
--
GitLab