From: Fernando Ramos <greenfoo@u92.eu>
To: greenfoo@u92.eu
Cc: felipe.contreras@gmail.com, git@vger.kernel.org
Subject: [PATCH v3 2/3] mergetools: vimdiff: fix single tab mode, single window mode and colors
Date: Mon, 8 Aug 2022 07:34:58 +0200 [thread overview]
Message-ID: <20220808053459.184367-3-greenfoo@u92.eu> (raw)
In-Reply-To: <20220808053459.184367-1-greenfoo@u92.eu>
vimdiff3 was introduced in 7c147b77d3 (mergetools: add vimdiff3 mode,
2014-04-20) and then partially broken in 0041797449 (vimdiff: new
implementation with layout support, 2022-03-30) in two ways:
- It does not show colors unless the user has "set hidden" in his
.vimrc file
- It prompts the user to "Press ENTER" every time it runs.
This patch fixes both issues and, in adition:
- Unifies the previously "special" case where LAYOUT contained one single tab
with one single window.
- Fixes colors in tabs with just one window.
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
---
mergetools/vimdiff | 69 ++++++++++++++++++++++++++++++++--------------
1 file changed, 49 insertions(+), 20 deletions(-)
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index ea416adcaa..f8cd7a83f0 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -55,12 +55,40 @@ substring () {
echo "$STRING" | cut -c$(( START + 1 ))-$(( START + $LEN ))
}
+enable_diff_mode () {
+ # Auxiliary function that appends extra vim commands at the end of each
+ # tab section to enable diff mode
+
+ NUMBER_OF_WINDOWS_IN_TAB=$1
+
+ if test "$NUMBER_OF_WINDOWS_IN_TAB" -eq 1
+ then
+ # Tabs that only contains one window will "diff"
+ # against all loaded/hidden buffers
+
+ echo "let tmp=bufnr('%') | execute 'silent 1,4bufdo diffthis' | execute 'buffer '.tmp"
+ else
+ # Tabs that contain more than one window will
+ # only "diff" against those windows
+
+ echo "execute 'windo diffthis'"
+ fi
+}
+
gen_cmd_aux () {
# Auxiliary function used from "gen_cmd()".
# Read that other function documentation for more details.
+ #
+ # This function returns two items
+ # - STDOUT: The vim command to use
+ # - RETCODE: The number of windows opened in the current tab
- LAYOUT=$1
- CMD=$2 # This is a second (hidden) argument used for recursion
+ WINDOWS_NR=$1 # Number of windows opened in the current tab after
+ # having parsed the provided "LAYOUT"
+ # If applicable, this variable will be updated and
+ # returned in RETCODE
+ LAYOUT=$2 # Substring (from the original LAYOUT) to process
+ CMD=$3 # This is a third (hidden) argument used for recursion
debug_print
debug_print "LAYOUT : $LAYOUT"
@@ -232,6 +260,7 @@ gen_cmd_aux () {
after="wincmd j"
index=$index_horizontal_split
terminate="true"
+ WINDOWS_NR=$(( WINDOWS_NR + 1 ))
elif ! test -z "$index_vertical_split"
then
@@ -239,16 +268,27 @@ gen_cmd_aux () {
after="wincmd l"
index=$index_vertical_split
terminate="true"
+ WINDOWS_NR=$(( WINDOWS_NR + 1 ))
fi
if test "$terminate" = "true"
then
CMD="$CMD | $before"
- CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$start" "$(( index - start ))")" "$CMD")
+ CMD=$(gen_cmd_aux $WINDOWS_NR "$(substring "$LAYOUT" "$start" "$(( index - start ))")" "$CMD")
+ WINDOWS_NR=$?
+
+ if ! test -z "$index_new_tab"
+ then
+ CMD="$CMD | $(enable_diff_mode $WINDOWS_NR)"
+ WINDOWS_NR=1
+ fi
+
CMD="$CMD | $after"
- CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$(( index + 1 ))" "$(( ${#LAYOUT} - index ))")" "$CMD")
+ CMD=$(gen_cmd_aux $WINDOWS_NR "$(substring "$LAYOUT" "$(( index + 1 ))" "$(( ${#LAYOUT} - index ))")" "$CMD")
+ WINDOWS_NR=$?
+
echo "$CMD"
- return
+ return $WINDOWS_NR
fi
@@ -280,10 +320,9 @@ gen_cmd_aux () {
fi
echo "$CMD"
- return
+ return $WINDOWS_NR
}
-
gen_cmd () {
# This function returns (in global variable FINAL_CMD) the string that
# you can use when invoking "vim" (as shown next) to obtain a given
@@ -333,25 +372,15 @@ gen_cmd () {
# Obtain the first part of vim "-c" option to obtain the desired layout
- CMD=$(gen_cmd_aux "$LAYOUT")
-
-
- # Adjust the just obtained script depending on whether more than one
- # windows are visible or not
-
- if echo "$LAYOUT" | grep ",\|/" >/dev/null
- then
- CMD="$CMD | tabdo windo diffthis"
- else
- CMD="$CMD | bufdo diffthis"
- fi
+ CMD=$(gen_cmd_aux 1 "$LAYOUT")
+ CMD="$CMD | $(enable_diff_mode $?)"
# Add an extra "-c" option to move to the first tab (notice that we
# can't simply append the command to the previous "-c" string as
# explained here: https://github.com/vim/vim/issues/9076
- FINAL_CMD="-c \"$CMD\" -c \"tabfirst\""
+ FINAL_CMD="-c \"set hidden diffopt-=hiddenoff diffopt-=closeoff\" -c \"$CMD\" -c \"tabfirst\""
}
--
2.37.1
next prev parent reply other threads:[~2022-08-08 5:35 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-07 2:49 [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 1/9] mergetools: vimdiff: fix comment Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 2/9] mergetools: vimdiff: shuffle single window case Felipe Contreras
2022-08-07 14:46 ` Fernando Ramos
2022-08-07 15:44 ` Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 3/9] mergetools: vimdiff: add get_buf() helper Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 4/9] mergetools: vimdiff: make vimdiff3 actually work Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 5/9] mergetools: vimdiff: silence annoying messages Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 6/9] mergetools: vimdiff: fix for diffopt Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 7/9] mergetools: vimdiff: cleanup cruft Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 8/9] mergetools: vimdiff: fix single window mode Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 9/9] mergetools: vimdiff: use vimdiff for vimdiff3 Felipe Contreras
2022-08-07 14:46 ` Fernando Ramos
2022-08-07 7:54 ` [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg Fernando Ramos
2022-08-07 15:39 ` Felipe Contreras
2022-08-07 18:39 ` Fernando Ramos
2022-08-07 18:43 ` [PATCH 1/2] vimdiff: fix single tab mode, single window mode and colors Fernando Ramos
2022-08-07 18:43 ` [PATCH 2/2] vimdiff: update unit tests Fernando Ramos
2022-08-07 22:27 ` [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg Felipe Contreras
2022-08-08 5:34 ` [PATCH v3 0/3] mergetools: vimdiff: regression fix (vimdiff3 mode) Fernando Ramos
2022-08-08 5:34 ` [PATCH v3 1/3] mergetools: vimdiff: fix comment Fernando Ramos
2022-08-08 5:34 ` Fernando Ramos [this message]
2022-08-08 6:37 ` [PATCH v3 2/3] mergetools: vimdiff: fix single tab mode, single window mode and colors Felipe Contreras
2022-08-08 18:14 ` Fernando Ramos
2022-08-08 21:00 ` Felipe Contreras
2022-08-08 21:51 ` Fernando Ramos
2022-08-09 0:59 ` Felipe Contreras
2022-08-08 5:34 ` [PATCH v3 3/3] mergetools: vimdiff: update unit tests Fernando Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220808053459.184367-3-greenfoo@u92.eu \
--to=greenfoo@u92.eu \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).