Bram Moolenaar | edf3f97 | 2016-08-29 22:49:24 +0200 | [diff] [blame] | 1 | /* vi:set ts=8 sts=4 sw=4 noet: |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2 | * |
| 3 | * VIM - Vi IMproved by Bram Moolenaar |
| 4 | * |
| 5 | * Do ":help uganda" in Vim to read copying and usage conditions. |
| 6 | * Do ":help credits" in Vim to see a list of people who contributed. |
| 7 | * See README.txt for an overview of the Vim source code. |
| 8 | */ |
| 9 | |
| 10 | /* |
Bram Moolenaar | 5cc6a6e | 2009-01-22 19:48:55 +0000 | [diff] [blame] | 11 | * diff.c: code for diff'ing two, three or four buffers. |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 12 | * |
| 13 | * There are three ways to diff: |
| 14 | * - Shell out to an external diff program, using files. |
| 15 | * - Use the compiled-in xdiff library. |
| 16 | * - Let 'diffexpr' do the work, using files. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 17 | */ |
| 18 | |
| 19 | #include "vim.h" |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 20 | #include "xdiff/xdiff.h" |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 21 | |
| 22 | #if defined(FEAT_DIFF) || defined(PROTO) |
| 23 | |
Bram Moolenaar | d2b58c0 | 2018-09-16 18:10:48 +0200 | [diff] [blame] | 24 | static int diff_busy = FALSE; // using diff structs, don't change them |
| 25 | static int diff_need_update = FALSE; // ex_diffupdate needs to be called |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 26 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 27 | // flags obtained from the 'diffopt' option |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 28 | #define DIFF_FILLER 0x001 // display filler lines |
| 29 | #define DIFF_IBLANK 0x002 // ignore empty lines |
| 30 | #define DIFF_ICASE 0x004 // ignore case |
| 31 | #define DIFF_IWHITE 0x008 // ignore change in white space |
| 32 | #define DIFF_IWHITEALL 0x010 // ignore all white space changes |
| 33 | #define DIFF_IWHITEEOL 0x020 // ignore change in white space at EOL |
| 34 | #define DIFF_HORIZONTAL 0x040 // horizontal splits |
| 35 | #define DIFF_VERTICAL 0x080 // vertical splits |
| 36 | #define DIFF_HIDDEN_OFF 0x100 // diffoff when hidden |
| 37 | #define DIFF_INTERNAL 0x200 // use internal xdiff algorithm |
Bram Moolenaar | c823477 | 2019-11-10 21:00:27 +0100 | [diff] [blame] | 38 | #define DIFF_CLOSE_OFF 0x400 // diffoff when closing window |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 39 | #define DIFF_FOLLOWWRAP 0x800 // follow the wrap option |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 40 | #define DIFF_LINEMATCH 0x1000 // match most similar lines within diff |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 41 | #define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL) |
Bram Moolenaar | c823477 | 2019-11-10 21:00:27 +0100 | [diff] [blame] | 42 | static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 43 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 44 | static long diff_algorithm = 0; |
| 45 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 46 | #define LBUFLEN 50 // length of line in diff file |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 47 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 48 | static int diff_a_works = MAYBE; // TRUE when "diff -a" works, FALSE when it |
| 49 | // doesn't work, MAYBE when not checked yet |
Bram Moolenaar | 48e330a | 2016-02-23 14:53:34 +0100 | [diff] [blame] | 50 | #if defined(MSWIN) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 51 | static int diff_bin_works = MAYBE; // TRUE when "diff --binary" works, FALSE |
| 52 | // when it doesn't work, MAYBE when not |
| 53 | // checked yet |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 54 | #endif |
| 55 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 56 | // used for diff input |
| 57 | typedef struct { |
| 58 | char_u *din_fname; // used for external diff |
| 59 | mmfile_t din_mmfile; // used for internal diff |
| 60 | } diffin_T; |
| 61 | |
| 62 | // used for diff result |
| 63 | typedef struct { |
| 64 | char_u *dout_fname; // used for external diff |
| 65 | garray_T dout_ga; // used for internal diff |
| 66 | } diffout_T; |
| 67 | |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 68 | // used for recording hunks from xdiff |
| 69 | typedef struct { |
| 70 | linenr_T lnum_orig; |
| 71 | long count_orig; |
| 72 | linenr_T lnum_new; |
| 73 | long count_new; |
| 74 | } diffhunk_T; |
| 75 | |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 76 | typedef enum { |
| 77 | DIO_OUTPUT_INDICES = 0, // default |
| 78 | DIO_OUTPUT_UNIFIED = 1 // unified diff format |
| 79 | } dio_outfmt_T; |
| 80 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 81 | // two diff inputs and one result |
| 82 | typedef struct { |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 83 | diffin_T dio_orig; // original file input |
| 84 | diffin_T dio_new; // new file input |
| 85 | diffout_T dio_diff; // diff result |
| 86 | int dio_internal; // using internal diff |
| 87 | dio_outfmt_T dio_outfmt; // internal diff output format |
| 88 | int dio_ctxlen; // unified diff context length |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 89 | } diffio_T; |
| 90 | |
Bram Moolenaar | f28dbce | 2016-01-29 22:03:47 +0100 | [diff] [blame] | 91 | static int diff_buf_idx(buf_T *buf); |
| 92 | static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp); |
| 93 | static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after); |
| 94 | static void diff_check_unchanged(tabpage_T *tp, diff_T *dp); |
| 95 | static int diff_check_sanity(tabpage_T *tp, diff_T *dp); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 96 | static int check_external_diff(diffio_T *diffio); |
| 97 | static int diff_file(diffio_T *diffio); |
Bram Moolenaar | f28dbce | 2016-01-29 22:03:47 +0100 | [diff] [blame] | 98 | static int diff_equal_entry(diff_T *dp, int idx1, int idx2); |
| 99 | static int diff_cmp(char_u *s1, char_u *s2); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 100 | #ifdef FEAT_FOLDING |
Bram Moolenaar | f28dbce | 2016-01-29 22:03:47 +0100 | [diff] [blame] | 101 | static void diff_fold_update(diff_T *dp, int skip_idx); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 102 | #endif |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 103 | static void diff_read(int idx_orig, int idx_new, diffio_T *dio); |
Bram Moolenaar | f28dbce | 2016-01-29 22:03:47 +0100 | [diff] [blame] | 104 | static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new); |
| 105 | static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp); |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 106 | static int parse_diff_ed(char_u *line, diffhunk_T *hunk); |
| 107 | static int parse_diff_unified(char_u *line, diffhunk_T *hunk); |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 108 | static int xdiff_out_indices(long start_a, long count_a, long start_b, long count_b, void *priv); |
| 109 | static int xdiff_out_unified(void *priv, mmbuffer_t *mb, int nbuf); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 110 | |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 111 | #define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \ |
| 112 | for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next) |
| 113 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 114 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 115 | * Called when deleting or unloading a buffer: No longer make a diff with it. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 116 | */ |
| 117 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 118 | diff_buf_delete(buf_T *buf) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 119 | { |
| 120 | int i; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 121 | tabpage_T *tp; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 122 | |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 123 | FOR_ALL_TABPAGES(tp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 124 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 125 | i = diff_buf_idx_tp(buf, tp); |
| 126 | if (i != DB_COUNT) |
| 127 | { |
| 128 | tp->tp_diffbuf[i] = NULL; |
| 129 | tp->tp_diff_invalid = TRUE; |
Bram Moolenaar | 5d55c0f | 2008-11-30 14:16:57 +0000 | [diff] [blame] | 130 | if (tp == curtab) |
Bram Moolenaar | cd38bb4 | 2022-06-26 14:04:07 +0100 | [diff] [blame] | 131 | { |
| 132 | // don't redraw right away, more might change or buffer state |
| 133 | // is invalid right now |
| 134 | need_diff_redraw = TRUE; |
Bram Moolenaar | a4d158b | 2022-08-14 14:17:45 +0100 | [diff] [blame] | 135 | redraw_later(UPD_VALID); |
Bram Moolenaar | cd38bb4 | 2022-06-26 14:04:07 +0100 | [diff] [blame] | 136 | } |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 137 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 138 | } |
| 139 | } |
| 140 | |
| 141 | /* |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 142 | * Check if the current buffer should be added to or removed from the list of |
| 143 | * diff buffers. |
| 144 | */ |
| 145 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 146 | diff_buf_adjust(win_T *win) |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 147 | { |
| 148 | win_T *wp; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 149 | int i; |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 150 | |
| 151 | if (!win->w_p_diff) |
| 152 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 153 | // When there is no window showing a diff for this buffer, remove |
| 154 | // it from the diffs. |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 155 | FOR_ALL_WINDOWS(wp) |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 156 | if (wp->w_buffer == win->w_buffer && wp->w_p_diff) |
| 157 | break; |
| 158 | if (wp == NULL) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 159 | { |
| 160 | i = diff_buf_idx(win->w_buffer); |
| 161 | if (i != DB_COUNT) |
| 162 | { |
| 163 | curtab->tp_diffbuf[i] = NULL; |
| 164 | curtab->tp_diff_invalid = TRUE; |
Bram Moolenaar | 5d55c0f | 2008-11-30 14:16:57 +0000 | [diff] [blame] | 165 | diff_redraw(TRUE); |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 166 | } |
| 167 | } |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 168 | } |
| 169 | else |
| 170 | diff_buf_add(win->w_buffer); |
| 171 | } |
| 172 | |
| 173 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 174 | * Add a buffer to make diffs for. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 175 | * Call this when a new buffer is being edited in the current window where |
| 176 | * 'diff' is set. |
Bram Moolenaar | 5cc6a6e | 2009-01-22 19:48:55 +0000 | [diff] [blame] | 177 | * Marks the current buffer as being part of the diff and requiring updating. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 178 | * This must be done before any autocmd, because a command may use info |
| 179 | * about the screen contents. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 180 | */ |
| 181 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 182 | diff_buf_add(buf_T *buf) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 183 | { |
| 184 | int i; |
| 185 | |
| 186 | if (diff_buf_idx(buf) != DB_COUNT) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 187 | return; // It's already there. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 188 | |
| 189 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 190 | if (curtab->tp_diffbuf[i] == NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 191 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 192 | curtab->tp_diffbuf[i] = buf; |
| 193 | curtab->tp_diff_invalid = TRUE; |
Bram Moolenaar | 5d55c0f | 2008-11-30 14:16:57 +0000 | [diff] [blame] | 194 | diff_redraw(TRUE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 195 | return; |
| 196 | } |
| 197 | |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 198 | semsg(_(e_cannot_diff_more_than_nr_buffers), DB_COUNT); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 199 | } |
| 200 | |
| 201 | /* |
Bram Moolenaar | 25ea054 | 2017-02-03 23:16:28 +0100 | [diff] [blame] | 202 | * Remove all buffers to make diffs for. |
| 203 | */ |
| 204 | static void |
| 205 | diff_buf_clear(void) |
| 206 | { |
| 207 | int i; |
| 208 | |
| 209 | for (i = 0; i < DB_COUNT; ++i) |
| 210 | if (curtab->tp_diffbuf[i] != NULL) |
| 211 | { |
| 212 | curtab->tp_diffbuf[i] = NULL; |
| 213 | curtab->tp_diff_invalid = TRUE; |
| 214 | diff_redraw(TRUE); |
| 215 | } |
| 216 | } |
| 217 | |
| 218 | /* |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 219 | * Find buffer "buf" in the list of diff buffers for the current tab page. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 220 | * Return its index or DB_COUNT if not found. |
| 221 | */ |
| 222 | static int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 223 | diff_buf_idx(buf_T *buf) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 224 | { |
| 225 | int idx; |
| 226 | |
| 227 | for (idx = 0; idx < DB_COUNT; ++idx) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 228 | if (curtab->tp_diffbuf[idx] == buf) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 229 | break; |
| 230 | return idx; |
| 231 | } |
| 232 | |
| 233 | /* |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 234 | * Find buffer "buf" in the list of diff buffers for tab page "tp". |
| 235 | * Return its index or DB_COUNT if not found. |
| 236 | */ |
| 237 | static int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 238 | diff_buf_idx_tp(buf_T *buf, tabpage_T *tp) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 239 | { |
| 240 | int idx; |
| 241 | |
| 242 | for (idx = 0; idx < DB_COUNT; ++idx) |
| 243 | if (tp->tp_diffbuf[idx] == buf) |
| 244 | break; |
| 245 | return idx; |
| 246 | } |
| 247 | |
| 248 | /* |
| 249 | * Mark the diff info involving buffer "buf" as invalid, it will be updated |
| 250 | * when info is requested. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 251 | */ |
| 252 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 253 | diff_invalidate(buf_T *buf) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 254 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 255 | tabpage_T *tp; |
| 256 | int i; |
| 257 | |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 258 | FOR_ALL_TABPAGES(tp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 259 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 260 | i = diff_buf_idx_tp(buf, tp); |
| 261 | if (i != DB_COUNT) |
| 262 | { |
| 263 | tp->tp_diff_invalid = TRUE; |
| 264 | if (tp == curtab) |
| 265 | diff_redraw(TRUE); |
| 266 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 267 | } |
| 268 | } |
| 269 | |
| 270 | /* |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 271 | * Called by mark_adjust(): update line numbers in "curbuf". |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 272 | */ |
| 273 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 274 | diff_mark_adjust( |
| 275 | linenr_T line1, |
| 276 | linenr_T line2, |
| 277 | long amount, |
| 278 | long amount_after) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 279 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 280 | int idx; |
| 281 | tabpage_T *tp; |
| 282 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 283 | // Handle all tab pages that use the current buffer in a diff. |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 284 | FOR_ALL_TABPAGES(tp) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 285 | { |
| 286 | idx = diff_buf_idx_tp(curbuf, tp); |
| 287 | if (idx != DB_COUNT) |
| 288 | diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after); |
| 289 | } |
| 290 | } |
| 291 | |
| 292 | /* |
| 293 | * Update line numbers in tab page "tp" for "curbuf" with index "idx". |
| 294 | * This attempts to update the changes as much as possible: |
| 295 | * When inserting/deleting lines outside of existing change blocks, create a |
| 296 | * new change block and update the line numbers in following blocks. |
| 297 | * When inserting/deleting lines in existing change blocks, update them. |
| 298 | */ |
| 299 | static void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 300 | diff_mark_adjust_tp( |
| 301 | tabpage_T *tp, |
| 302 | int idx, |
| 303 | linenr_T line1, |
| 304 | linenr_T line2, |
| 305 | long amount, |
| 306 | long amount_after) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 307 | { |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 308 | diff_T *dp; |
| 309 | diff_T *dprev; |
| 310 | diff_T *dnext; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 311 | int i; |
| 312 | int inserted, deleted; |
| 313 | int n, off; |
| 314 | linenr_T last; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 315 | linenr_T lnum_deleted = line1; // lnum of remaining deletion |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 316 | int check_unchanged; |
| 317 | |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 318 | if (diff_internal()) |
| 319 | { |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 320 | // Will update diffs before redrawing. Set _invalid to update the |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 321 | // diffs themselves, set _update to also update folds properly just |
| 322 | // before redrawing. |
Bram Moolenaar | 5f57bdc | 2018-10-25 17:52:23 +0200 | [diff] [blame] | 323 | // Do update marks here, it is needed for :%diffput. |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 324 | tp->tp_diff_invalid = TRUE; |
| 325 | tp->tp_diff_update = TRUE; |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 326 | } |
| 327 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 328 | if (line2 == MAXLNUM) |
| 329 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 330 | // mark_adjust(99, MAXLNUM, 9, 0): insert lines |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 331 | inserted = amount; |
| 332 | deleted = 0; |
| 333 | } |
| 334 | else if (amount_after > 0) |
| 335 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 336 | // mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 337 | inserted = amount_after; |
| 338 | deleted = 0; |
| 339 | } |
| 340 | else |
| 341 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 342 | // mark_adjust(98, 99, MAXLNUM, -2): delete lines |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 343 | inserted = 0; |
| 344 | deleted = -amount_after; |
| 345 | } |
| 346 | |
| 347 | dprev = NULL; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 348 | dp = tp->tp_first_diff; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 349 | for (;;) |
| 350 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 351 | // If the change is after the previous diff block and before the next |
| 352 | // diff block, thus not touching an existing change, create a new diff |
| 353 | // block. Don't do this when ex_diffgetput() is busy. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 354 | if ((dp == NULL || dp->df_lnum[idx] - 1 > line2 |
| 355 | || (line2 == MAXLNUM && dp->df_lnum[idx] > line1)) |
| 356 | && (dprev == NULL |
| 357 | || dprev->df_lnum[idx] + dprev->df_count[idx] < line1) |
| 358 | && !diff_busy) |
| 359 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 360 | dnext = diff_alloc_new(tp, dprev, dp); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 361 | if (dnext == NULL) |
| 362 | return; |
| 363 | |
| 364 | dnext->df_lnum[idx] = line1; |
| 365 | dnext->df_count[idx] = inserted; |
| 366 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 367 | if (tp->tp_diffbuf[i] != NULL && i != idx) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 368 | { |
| 369 | if (dprev == NULL) |
| 370 | dnext->df_lnum[i] = line1; |
| 371 | else |
| 372 | dnext->df_lnum[i] = line1 |
| 373 | + (dprev->df_lnum[i] + dprev->df_count[i]) |
| 374 | - (dprev->df_lnum[idx] + dprev->df_count[idx]); |
| 375 | dnext->df_count[i] = deleted; |
| 376 | } |
| 377 | } |
| 378 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 379 | // if at end of the list, quit |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 380 | if (dp == NULL) |
| 381 | break; |
| 382 | |
| 383 | /* |
| 384 | * Check for these situations: |
| 385 | * 1 2 3 |
| 386 | * 1 2 3 |
| 387 | * line1 2 3 4 5 |
| 388 | * 2 3 4 5 |
| 389 | * 2 3 4 5 |
| 390 | * line2 2 3 4 5 |
| 391 | * 3 5 6 |
| 392 | * 3 5 6 |
| 393 | */ |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 394 | // compute last line of this change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 395 | last = dp->df_lnum[idx] + dp->df_count[idx] - 1; |
| 396 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 397 | // 1. change completely above line1: nothing to do |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 398 | if (last >= line1 - 1) |
| 399 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 400 | // 6. change below line2: only adjust for amount_after; also when |
| 401 | // "deleted" became zero when deleted all lines between two diffs |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 402 | if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2 - |
| 403 | (dp->is_linematched ? 1 : 0)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 404 | { |
| 405 | if (amount_after == 0) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 406 | break; // nothing left to change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 407 | dp->df_lnum[idx] += amount_after; |
| 408 | } |
| 409 | else |
| 410 | { |
| 411 | check_unchanged = FALSE; |
| 412 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 413 | // 2. 3. 4. 5.: inserted/deleted lines touching this diff. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 414 | if (deleted > 0) |
| 415 | { |
Bram Moolenaar | c101abf | 2022-06-26 16:53:34 +0100 | [diff] [blame] | 416 | off = 0; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 417 | if (dp->df_lnum[idx] >= line1) |
| 418 | { |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 419 | if (last <= line2) |
| 420 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 421 | // 4. delete all lines of diff |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 422 | if (dp->df_next != NULL |
| 423 | && dp->df_next->df_lnum[idx] - 1 <= line2) |
| 424 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 425 | // delete continues in next diff, only do |
| 426 | // lines until that one |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 427 | n = dp->df_next->df_lnum[idx] - lnum_deleted; |
| 428 | deleted -= n; |
| 429 | n -= dp->df_count[idx]; |
| 430 | lnum_deleted = dp->df_next->df_lnum[idx]; |
| 431 | } |
| 432 | else |
| 433 | n = deleted - dp->df_count[idx]; |
| 434 | dp->df_count[idx] = 0; |
| 435 | } |
| 436 | else |
| 437 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 438 | // 5. delete lines at or just before top of diff |
Bram Moolenaar | c101abf | 2022-06-26 16:53:34 +0100 | [diff] [blame] | 439 | off = dp->df_lnum[idx] - lnum_deleted; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 440 | n = off; |
| 441 | dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1; |
| 442 | check_unchanged = TRUE; |
| 443 | } |
| 444 | dp->df_lnum[idx] = line1; |
| 445 | } |
| 446 | else |
| 447 | { |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 448 | if (last < line2) |
| 449 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 450 | // 2. delete at end of diff |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 451 | dp->df_count[idx] -= last - lnum_deleted + 1; |
| 452 | if (dp->df_next != NULL |
| 453 | && dp->df_next->df_lnum[idx] - 1 <= line2) |
| 454 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 455 | // delete continues in next diff, only do |
| 456 | // lines until that one |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 457 | n = dp->df_next->df_lnum[idx] - 1 - last; |
| 458 | deleted -= dp->df_next->df_lnum[idx] |
| 459 | - lnum_deleted; |
| 460 | lnum_deleted = dp->df_next->df_lnum[idx]; |
| 461 | } |
| 462 | else |
| 463 | n = line2 - last; |
| 464 | check_unchanged = TRUE; |
| 465 | } |
| 466 | else |
| 467 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 468 | // 3. delete lines inside the diff |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 469 | n = 0; |
| 470 | dp->df_count[idx] -= deleted; |
| 471 | } |
| 472 | } |
| 473 | |
| 474 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 475 | if (tp->tp_diffbuf[i] != NULL && i != idx) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 476 | { |
Bram Moolenaar | 4e677b9 | 2022-07-28 18:44:27 +0100 | [diff] [blame] | 477 | if (dp->df_lnum[i] > off) |
| 478 | dp->df_lnum[i] -= off; |
| 479 | else |
| 480 | dp->df_lnum[i] = 1; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 481 | dp->df_count[i] += n; |
| 482 | } |
| 483 | } |
| 484 | else |
| 485 | { |
| 486 | if (dp->df_lnum[idx] <= line1) |
| 487 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 488 | // inserted lines somewhere in this diff |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 489 | dp->df_count[idx] += inserted; |
| 490 | check_unchanged = TRUE; |
| 491 | } |
| 492 | else |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 493 | // inserted lines somewhere above this diff |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 494 | dp->df_lnum[idx] += inserted; |
| 495 | } |
| 496 | |
| 497 | if (check_unchanged) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 498 | // Check if inserted lines are equal, may reduce the |
| 499 | // size of the diff. TODO: also check for equal lines |
| 500 | // in the middle and perhaps split the block. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 501 | diff_check_unchanged(tp, dp); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 502 | } |
| 503 | } |
| 504 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 505 | // check if this block touches the previous one, may merge them. |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 506 | if (dprev != NULL && !dp->is_linematched |
| 507 | && dprev->df_lnum[idx] + dprev->df_count[idx] |
| 508 | == dp->df_lnum[idx]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 509 | { |
| 510 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 511 | if (tp->tp_diffbuf[i] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 512 | dprev->df_count[i] += dp->df_count[i]; |
| 513 | dprev->df_next = dp->df_next; |
| 514 | vim_free(dp); |
| 515 | dp = dprev->df_next; |
| 516 | } |
| 517 | else |
| 518 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 519 | // Advance to next entry. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 520 | dprev = dp; |
| 521 | dp = dp->df_next; |
| 522 | } |
| 523 | } |
| 524 | |
| 525 | dprev = NULL; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 526 | dp = tp->tp_first_diff; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 527 | while (dp != NULL) |
| 528 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 529 | // All counts are zero, remove this entry. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 530 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 531 | if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 532 | break; |
| 533 | if (i == DB_COUNT) |
| 534 | { |
| 535 | dnext = dp->df_next; |
| 536 | vim_free(dp); |
| 537 | dp = dnext; |
| 538 | if (dprev == NULL) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 539 | tp->tp_first_diff = dnext; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 540 | else |
| 541 | dprev->df_next = dnext; |
| 542 | } |
| 543 | else |
| 544 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 545 | // Advance to next entry. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 546 | dprev = dp; |
| 547 | dp = dp->df_next; |
| 548 | } |
| 549 | |
| 550 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 551 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 552 | if (tp == curtab) |
| 553 | { |
Bram Moolenaar | 4f57eef | 2019-08-24 20:54:19 +0200 | [diff] [blame] | 554 | // Don't redraw right away, this updates the diffs, which can be slow. |
| 555 | need_diff_redraw = TRUE; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 556 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 557 | // Need to recompute the scroll binding, may remove or add filler |
| 558 | // lines (e.g., when adding lines above w_topline). But it's slow when |
| 559 | // making many changes, postpone until redrawing. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 560 | diff_need_scrollbind = TRUE; |
| 561 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 562 | } |
| 563 | |
| 564 | /* |
| 565 | * Allocate a new diff block and link it between "dprev" and "dp". |
| 566 | */ |
| 567 | static diff_T * |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 568 | diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 569 | { |
| 570 | diff_T *dnew; |
| 571 | |
Bram Moolenaar | c799fe2 | 2019-05-28 23:08:19 +0200 | [diff] [blame] | 572 | dnew = ALLOC_ONE(diff_T); |
Yegappan Lakshmanan | 1cfb14a | 2023-01-09 19:04:23 +0000 | [diff] [blame] | 573 | if (dnew == NULL) |
| 574 | return NULL; |
| 575 | |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 576 | dnew->is_linematched = FALSE; |
Yegappan Lakshmanan | 1cfb14a | 2023-01-09 19:04:23 +0000 | [diff] [blame] | 577 | dnew->df_next = dp; |
| 578 | if (dprev == NULL) |
| 579 | tp->tp_first_diff = dnew; |
| 580 | else |
| 581 | dprev->df_next = dnew; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 582 | return dnew; |
| 583 | } |
| 584 | |
| 585 | /* |
| 586 | * Check if the diff block "dp" can be made smaller for lines at the start and |
| 587 | * end that are equal. Called after inserting lines. |
| 588 | * This may result in a change where all buffers have zero lines, the caller |
| 589 | * must take care of removing it. |
| 590 | */ |
| 591 | static void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 592 | diff_check_unchanged(tabpage_T *tp, diff_T *dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 593 | { |
| 594 | int i_org; |
| 595 | int i_new; |
| 596 | int off_org, off_new; |
| 597 | char_u *line_org; |
| 598 | int dir = FORWARD; |
| 599 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 600 | // Find the first buffers, use it as the original, compare the other |
| 601 | // buffer lines against this one. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 602 | for (i_org = 0; i_org < DB_COUNT; ++i_org) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 603 | if (tp->tp_diffbuf[i_org] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 604 | break; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 605 | if (i_org == DB_COUNT) // safety check |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 606 | return; |
| 607 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 608 | if (diff_check_sanity(tp, dp) == FAIL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 609 | return; |
| 610 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 611 | // First check lines at the top, then at the bottom. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 612 | off_org = 0; |
| 613 | off_new = 0; |
| 614 | for (;;) |
| 615 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 616 | // Repeat until a line is found which is different or the number of |
| 617 | // lines has become zero. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 618 | while (dp->df_count[i_org] > 0) |
| 619 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 620 | // Copy the line, the next ml_get() will invalidate it. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 621 | if (dir == BACKWARD) |
| 622 | off_org = dp->df_count[i_org] - 1; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 623 | line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org], |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 624 | dp->df_lnum[i_org] + off_org, FALSE)); |
| 625 | if (line_org == NULL) |
| 626 | return; |
| 627 | for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new) |
| 628 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 629 | if (tp->tp_diffbuf[i_new] == NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 630 | continue; |
| 631 | if (dir == BACKWARD) |
| 632 | off_new = dp->df_count[i_new] - 1; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 633 | // if other buffer doesn't have this line, it was inserted |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 634 | if (off_new < 0 || off_new >= dp->df_count[i_new]) |
| 635 | break; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 636 | if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new], |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 637 | dp->df_lnum[i_new] + off_new, FALSE)) != 0) |
| 638 | break; |
| 639 | } |
| 640 | vim_free(line_org); |
| 641 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 642 | // Stop when a line isn't equal in all diff buffers. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 643 | if (i_new != DB_COUNT) |
| 644 | break; |
| 645 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 646 | // Line matched in all buffers, remove it from the diff. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 647 | for (i_new = i_org; i_new < DB_COUNT; ++i_new) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 648 | if (tp->tp_diffbuf[i_new] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 649 | { |
| 650 | if (dir == FORWARD) |
| 651 | ++dp->df_lnum[i_new]; |
| 652 | --dp->df_count[i_new]; |
| 653 | } |
| 654 | } |
| 655 | if (dir == BACKWARD) |
| 656 | break; |
| 657 | dir = BACKWARD; |
| 658 | } |
| 659 | } |
| 660 | |
| 661 | /* |
| 662 | * Check if a diff block doesn't contain invalid line numbers. |
| 663 | * This can happen when the diff program returns invalid results. |
| 664 | */ |
| 665 | static int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 666 | diff_check_sanity(tabpage_T *tp, diff_T *dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 667 | { |
| 668 | int i; |
| 669 | |
| 670 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 671 | if (tp->tp_diffbuf[i] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 672 | if (dp->df_lnum[i] + dp->df_count[i] - 1 |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 673 | > tp->tp_diffbuf[i]->b_ml.ml_line_count) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 674 | return FAIL; |
| 675 | return OK; |
| 676 | } |
| 677 | |
| 678 | /* |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 679 | * Mark all diff buffers in the current tab page for redraw. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 680 | */ |
Bram Moolenaar | 4f57eef | 2019-08-24 20:54:19 +0200 | [diff] [blame] | 681 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 682 | diff_redraw( |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 683 | int dofold) // also recompute the folds |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 684 | { |
| 685 | win_T *wp; |
Bram Moolenaar | 04626c2 | 2021-09-01 16:02:07 +0200 | [diff] [blame] | 686 | win_T *wp_other = NULL; |
Bram Moolenaar | 841c225 | 2021-10-22 20:56:55 +0100 | [diff] [blame] | 687 | int used_max_fill_other = FALSE; |
| 688 | int used_max_fill_curwin = FALSE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 689 | int n; |
| 690 | |
Bram Moolenaar | 4f57eef | 2019-08-24 20:54:19 +0200 | [diff] [blame] | 691 | need_diff_redraw = FALSE; |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 692 | FOR_ALL_WINDOWS(wp) |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 693 | { |
Bram Moolenaar | cd38bb4 | 2022-06-26 14:04:07 +0100 | [diff] [blame] | 694 | // when closing windows or wiping buffers skip invalid window |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 695 | if (!wp->w_p_diff || !buf_valid(wp->w_buffer)) |
| 696 | continue; |
| 697 | |
Bram Moolenaar | a4d158b | 2022-08-14 14:17:45 +0100 | [diff] [blame] | 698 | redraw_win_later(wp, UPD_SOME_VALID); |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 699 | if (wp != curwin) |
| 700 | wp_other = wp; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 701 | #ifdef FEAT_FOLDING |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 702 | if (dofold && foldmethodIsDiff(wp)) |
| 703 | foldUpdateAll(wp); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 704 | #endif |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 705 | // A change may have made filler lines invalid, need to take care of |
| 706 | // that for other windows. |
| 707 | n = diff_check(wp, wp->w_topline); |
| 708 | if ((wp != curwin && wp->w_topfill > 0) || n > 0) |
| 709 | { |
| 710 | if (wp->w_topfill > n) |
| 711 | wp->w_topfill = (n < 0 ? 0 : n); |
| 712 | else if (n > 0 && n > wp->w_topfill) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 713 | { |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 714 | wp->w_topfill = n; |
| 715 | if (wp == curwin) |
| 716 | used_max_fill_curwin = TRUE; |
| 717 | else if (wp_other != NULL) |
| 718 | used_max_fill_other = TRUE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 719 | } |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 720 | check_topfill(wp, FALSE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 721 | } |
zeertzjq | 101d57b | 2022-07-31 18:34:32 +0100 | [diff] [blame] | 722 | } |
Bram Moolenaar | 04626c2 | 2021-09-01 16:02:07 +0200 | [diff] [blame] | 723 | |
Bram Moolenaar | 841c225 | 2021-10-22 20:56:55 +0100 | [diff] [blame] | 724 | if (wp_other != NULL && curwin->w_p_scb) |
| 725 | { |
| 726 | if (used_max_fill_curwin) |
Dominique Pelle | af4a61a | 2021-12-27 17:21:41 +0000 | [diff] [blame] | 727 | // The current window was set to use the maximum number of filler |
Bram Moolenaar | 841c225 | 2021-10-22 20:56:55 +0100 | [diff] [blame] | 728 | // lines, may need to reduce them. |
| 729 | diff_set_topline(wp_other, curwin); |
| 730 | else if (used_max_fill_other) |
Dominique Pelle | af4a61a | 2021-12-27 17:21:41 +0000 | [diff] [blame] | 731 | // The other window was set to use the maximum number of filler |
Bram Moolenaar | 841c225 | 2021-10-22 20:56:55 +0100 | [diff] [blame] | 732 | // lines, may need to reduce them. |
| 733 | diff_set_topline(curwin, wp_other); |
| 734 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 735 | } |
| 736 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 737 | static void |
| 738 | clear_diffin(diffin_T *din) |
| 739 | { |
| 740 | if (din->din_fname == NULL) |
Yegappan Lakshmanan | 960dcbd | 2023-03-07 17:45:11 +0000 | [diff] [blame] | 741 | VIM_CLEAR(din->din_mmfile.ptr); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 742 | else |
| 743 | mch_remove(din->din_fname); |
| 744 | } |
| 745 | |
| 746 | static void |
| 747 | clear_diffout(diffout_T *dout) |
| 748 | { |
| 749 | if (dout->dout_fname == NULL) |
| 750 | ga_clear_strings(&dout->dout_ga); |
| 751 | else |
| 752 | mch_remove(dout->dout_fname); |
| 753 | } |
| 754 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 755 | /* |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 756 | * Write buffer "buf" to a memory buffer. |
| 757 | * Return FAIL for failure. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 758 | */ |
| 759 | static int |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 760 | diff_write_buffer(buf_T *buf, diffin_T *din, linenr_T start, linenr_T end) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 761 | { |
| 762 | linenr_T lnum; |
| 763 | char_u *s; |
| 764 | long len = 0; |
| 765 | char_u *ptr; |
| 766 | |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 767 | if (end < 0) |
| 768 | end = buf->b_ml.ml_line_count; |
| 769 | |
Yukihiro Nakadaira | f1694b4 | 2024-09-22 11:26:13 +0200 | [diff] [blame] | 770 | if (buf->b_ml.ml_flags & ML_EMPTY) |
| 771 | { |
| 772 | din->din_mmfile.ptr = NULL; |
| 773 | din->din_mmfile.size = 0; |
| 774 | return OK; |
| 775 | } |
| 776 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 777 | // xdiff requires one big block of memory with all the text. |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 778 | for (lnum = start; lnum <= end; ++lnum) |
zeertzjq | 94b7c32 | 2024-03-12 21:50:32 +0100 | [diff] [blame] | 779 | len += ml_get_buf_len(buf, lnum) + 1; |
Bram Moolenaar | 18a4ba2 | 2019-05-24 19:39:03 +0200 | [diff] [blame] | 780 | ptr = alloc(len); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 781 | if (ptr == NULL) |
| 782 | { |
| 783 | // Allocating memory failed. This can happen, because we try to read |
| 784 | // the whole buffer text into memory. Set the failed flag, the diff |
| 785 | // will be retried with external diff. The flag is never reset. |
| 786 | buf->b_diff_failed = TRUE; |
| 787 | if (p_verbose > 0) |
| 788 | { |
| 789 | verbose_enter(); |
Bram Moolenaar | f9e3e09 | 2019-01-13 23:38:42 +0100 | [diff] [blame] | 790 | smsg(_("Not enough memory to use internal diff for buffer \"%s\""), |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 791 | buf->b_fname); |
| 792 | verbose_leave(); |
| 793 | } |
| 794 | return FAIL; |
| 795 | } |
| 796 | din->din_mmfile.ptr = (char *)ptr; |
| 797 | din->din_mmfile.size = len; |
| 798 | |
| 799 | len = 0; |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 800 | for (lnum = start; lnum <= end; ++lnum) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 801 | { |
| 802 | for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; ) |
| 803 | { |
| 804 | if (diff_flags & DIFF_ICASE) |
| 805 | { |
| 806 | int c; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 807 | int orig_len; |
| 808 | char_u cbuf[MB_MAXBYTES + 1]; |
| 809 | |
Bram Moolenaar | 06f6095 | 2021-12-28 18:30:05 +0000 | [diff] [blame] | 810 | if (*s == NL) |
| 811 | c = NUL; |
| 812 | else |
| 813 | { |
| 814 | // xdiff doesn't support ignoring case, fold-case the text. |
| 815 | c = PTR2CHAR(s); |
| 816 | c = MB_CASEFOLD(c); |
| 817 | } |
Bram Moolenaar | 1614a14 | 2019-10-06 22:00:13 +0200 | [diff] [blame] | 818 | orig_len = mb_ptr2len(s); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 819 | if (mb_char2bytes(c, cbuf) != orig_len) |
| 820 | // TODO: handle byte length difference |
| 821 | mch_memmove(ptr + len, s, orig_len); |
| 822 | else |
| 823 | mch_memmove(ptr + len, cbuf, orig_len); |
| 824 | |
| 825 | s += orig_len; |
| 826 | len += orig_len; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 827 | } |
| 828 | else |
Bram Moolenaar | 06f6095 | 2021-12-28 18:30:05 +0000 | [diff] [blame] | 829 | { |
| 830 | ptr[len++] = *s == NL ? NUL : *s; |
| 831 | s++; |
| 832 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 833 | } |
| 834 | ptr[len++] = NL; |
| 835 | } |
| 836 | return OK; |
| 837 | } |
| 838 | |
| 839 | /* |
| 840 | * Write buffer "buf" to file or memory buffer. |
| 841 | * Return FAIL for failure. |
| 842 | */ |
| 843 | static int |
| 844 | diff_write(buf_T *buf, diffin_T *din) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 845 | { |
| 846 | int r; |
| 847 | char_u *save_ff; |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 848 | int save_cmod_flags; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 849 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 850 | if (din->din_fname == NULL) |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 851 | return diff_write_buffer(buf, din, 1, -1); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 852 | |
| 853 | // Always use 'fileformat' set to "unix". |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 854 | save_ff = buf->b_p_ff; |
| 855 | buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 856 | save_cmod_flags = cmdmod.cmod_flags; |
Bram Moolenaar | f4a1d1c | 2019-11-16 13:50:25 +0100 | [diff] [blame] | 857 | // Writing the buffer is an implementation detail of performing the diff, |
| 858 | // so it shouldn't update the '[ and '] marks. |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 859 | cmdmod.cmod_flags |= CMOD_LOCKMARKS; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 860 | r = buf_write(buf, din->din_fname, NULL, |
| 861 | (linenr_T)1, buf->b_ml.ml_line_count, |
| 862 | NULL, FALSE, FALSE, FALSE, TRUE); |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 863 | cmdmod.cmod_flags = save_cmod_flags; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 864 | free_string_option(buf->b_p_ff); |
| 865 | buf->b_p_ff = save_ff; |
| 866 | return r; |
| 867 | } |
| 868 | |
| 869 | /* |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 870 | * Update the diffs for all buffers involved. |
| 871 | */ |
| 872 | static void |
| 873 | diff_try_update( |
| 874 | diffio_T *dio, |
| 875 | int idx_orig, |
| 876 | exarg_T *eap) // "eap" can be NULL |
| 877 | { |
| 878 | buf_T *buf; |
| 879 | int idx_new; |
| 880 | |
| 881 | if (dio->dio_internal) |
| 882 | { |
| 883 | ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000); |
| 884 | } |
| 885 | else |
| 886 | { |
| 887 | // We need three temp file names. |
| 888 | dio->dio_orig.din_fname = vim_tempname('o', TRUE); |
| 889 | dio->dio_new.din_fname = vim_tempname('n', TRUE); |
| 890 | dio->dio_diff.dout_fname = vim_tempname('d', TRUE); |
| 891 | if (dio->dio_orig.din_fname == NULL |
| 892 | || dio->dio_new.din_fname == NULL |
| 893 | || dio->dio_diff.dout_fname == NULL) |
| 894 | goto theend; |
| 895 | } |
| 896 | |
| 897 | // Check external diff is actually working. |
| 898 | if (!dio->dio_internal && check_external_diff(dio) == FAIL) |
| 899 | goto theend; |
| 900 | |
| 901 | // :diffupdate! |
| 902 | if (eap != NULL && eap->forceit) |
| 903 | for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new) |
| 904 | { |
| 905 | buf = curtab->tp_diffbuf[idx_new]; |
| 906 | if (buf_valid(buf)) |
| 907 | buf_check_timestamp(buf, FALSE); |
| 908 | } |
| 909 | |
| 910 | // Write the first buffer to a tempfile or mmfile_t. |
| 911 | buf = curtab->tp_diffbuf[idx_orig]; |
| 912 | if (diff_write(buf, &dio->dio_orig) == FAIL) |
| 913 | goto theend; |
| 914 | |
| 915 | // Make a difference between the first buffer and every other. |
| 916 | for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) |
| 917 | { |
| 918 | buf = curtab->tp_diffbuf[idx_new]; |
| 919 | if (buf == NULL || buf->b_ml.ml_mfp == NULL) |
| 920 | continue; // skip buffer that isn't loaded |
| 921 | |
| 922 | // Write the other buffer and diff with the first one. |
| 923 | if (diff_write(buf, &dio->dio_new) == FAIL) |
| 924 | continue; |
| 925 | if (diff_file(dio) == FAIL) |
| 926 | continue; |
| 927 | |
| 928 | // Read the diff output and add each entry to the diff list. |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 929 | diff_read(idx_orig, idx_new, dio); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 930 | |
| 931 | clear_diffin(&dio->dio_new); |
| 932 | clear_diffout(&dio->dio_diff); |
| 933 | } |
| 934 | clear_diffin(&dio->dio_orig); |
| 935 | |
| 936 | theend: |
| 937 | vim_free(dio->dio_orig.din_fname); |
| 938 | vim_free(dio->dio_new.din_fname); |
| 939 | vim_free(dio->dio_diff.dout_fname); |
| 940 | } |
| 941 | |
| 942 | /* |
| 943 | * Return TRUE if the options are set to use the internal diff library. |
| 944 | * Note that if the internal diff failed for one of the buffers, the external |
| 945 | * diff will be used anyway. |
| 946 | */ |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 947 | int |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 948 | diff_internal(void) |
| 949 | { |
Bram Moolenaar | 975880b | 2019-03-03 14:42:11 +0100 | [diff] [blame] | 950 | return (diff_flags & DIFF_INTERNAL) != 0 |
| 951 | #ifdef FEAT_EVAL |
| 952 | && *p_dex == NUL |
| 953 | #endif |
| 954 | ; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 955 | } |
| 956 | |
| 957 | /* |
| 958 | * Return TRUE if the internal diff failed for one of the diff buffers. |
| 959 | */ |
| 960 | static int |
| 961 | diff_internal_failed(void) |
| 962 | { |
| 963 | int idx; |
| 964 | |
| 965 | // Only need to do something when there is another buffer. |
| 966 | for (idx = 0; idx < DB_COUNT; ++idx) |
| 967 | if (curtab->tp_diffbuf[idx] != NULL |
| 968 | && curtab->tp_diffbuf[idx]->b_diff_failed) |
| 969 | return TRUE; |
| 970 | return FALSE; |
| 971 | } |
| 972 | |
| 973 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 974 | * Completely update the diffs for the buffers involved. |
Bram Moolenaar | e3521d9 | 2018-09-16 14:10:31 +0200 | [diff] [blame] | 975 | * When using the external "diff" command the buffers are written to a file, |
| 976 | * also for unmodified buffers (the file could have been produced by |
| 977 | * autocommands, e.g. the netrw plugin). |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 978 | */ |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 979 | void |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 980 | ex_diffupdate(exarg_T *eap) // "eap" can be NULL |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 981 | { |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 982 | int idx_orig; |
| 983 | int idx_new; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 984 | diffio_T diffio; |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 985 | int had_diffs = curtab->tp_first_diff != NULL; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 986 | |
Bram Moolenaar | d2b58c0 | 2018-09-16 18:10:48 +0200 | [diff] [blame] | 987 | if (diff_busy) |
| 988 | { |
| 989 | diff_need_update = TRUE; |
| 990 | return; |
| 991 | } |
| 992 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 993 | // Delete all diffblocks. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 994 | diff_clear(curtab); |
| 995 | curtab->tp_diff_invalid = FALSE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 996 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 997 | // Use the first buffer as the original text. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 998 | for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 999 | if (curtab->tp_diffbuf[idx_orig] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1000 | break; |
| 1001 | if (idx_orig == DB_COUNT) |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 1002 | goto theend; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1003 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1004 | // Only need to do something when there is another buffer. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1005 | for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1006 | if (curtab->tp_diffbuf[idx_new] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1007 | break; |
| 1008 | if (idx_new == DB_COUNT) |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 1009 | goto theend; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1010 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1011 | // Only use the internal method if it did not fail for one of the buffers. |
Bram Moolenaar | a80faa8 | 2020-04-12 19:37:17 +0200 | [diff] [blame] | 1012 | CLEAR_FIELD(diffio); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1013 | diffio.dio_internal = diff_internal() && !diff_internal_failed(); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1014 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1015 | diff_try_update(&diffio, idx_orig, eap); |
| 1016 | if (diffio.dio_internal && diff_internal_failed()) |
| 1017 | { |
| 1018 | // Internal diff failed, use external diff instead. |
Bram Moolenaar | a80faa8 | 2020-04-12 19:37:17 +0200 | [diff] [blame] | 1019 | CLEAR_FIELD(diffio); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1020 | diff_try_update(&diffio, idx_orig, eap); |
| 1021 | } |
| 1022 | |
| 1023 | // force updating cursor position on screen |
| 1024 | curwin->w_valid_cursor.lnum = 0; |
| 1025 | |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 1026 | theend: |
| 1027 | // A redraw is needed if there were diffs and they were cleared, or there |
| 1028 | // are diffs now, which means they got updated. |
| 1029 | if (had_diffs || curtab->tp_first_diff != NULL) |
| 1030 | { |
| 1031 | diff_redraw(TRUE); |
| 1032 | apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf); |
| 1033 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1034 | } |
| 1035 | |
| 1036 | /* |
| 1037 | * Do a quick test if "diff" really works. Otherwise it looks like there |
| 1038 | * are no differences. Can't use the return value, it's non-zero when |
| 1039 | * there are differences. |
| 1040 | */ |
| 1041 | static int |
| 1042 | check_external_diff(diffio_T *diffio) |
| 1043 | { |
| 1044 | FILE *fd; |
| 1045 | int ok; |
| 1046 | int io_error = FALSE; |
| 1047 | |
| 1048 | // May try twice, first with "-a" and then without. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1049 | for (;;) |
| 1050 | { |
| 1051 | ok = FALSE; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1052 | fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w"); |
Bram Moolenaar | fe86f2d | 2008-11-28 20:29:07 +0000 | [diff] [blame] | 1053 | if (fd == NULL) |
| 1054 | io_error = TRUE; |
| 1055 | else |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1056 | { |
Bram Moolenaar | fe86f2d | 2008-11-28 20:29:07 +0000 | [diff] [blame] | 1057 | if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1) |
| 1058 | io_error = TRUE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1059 | fclose(fd); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1060 | fd = mch_fopen((char *)diffio->dio_new.din_fname, "w"); |
Bram Moolenaar | fe86f2d | 2008-11-28 20:29:07 +0000 | [diff] [blame] | 1061 | if (fd == NULL) |
| 1062 | io_error = TRUE; |
| 1063 | else |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1064 | { |
Bram Moolenaar | fe86f2d | 2008-11-28 20:29:07 +0000 | [diff] [blame] | 1065 | if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1) |
| 1066 | io_error = TRUE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1067 | fclose(fd); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1068 | fd = NULL; |
| 1069 | if (diff_file(diffio) == OK) |
| 1070 | fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r"); |
Bram Moolenaar | fe86f2d | 2008-11-28 20:29:07 +0000 | [diff] [blame] | 1071 | if (fd == NULL) |
| 1072 | io_error = TRUE; |
| 1073 | else |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1074 | { |
| 1075 | char_u linebuf[LBUFLEN]; |
| 1076 | |
| 1077 | for (;;) |
| 1078 | { |
glacambre | ad5c178 | 2021-05-24 14:20:53 +0200 | [diff] [blame] | 1079 | // For normal diff there must be a line that contains |
| 1080 | // "1c1". For unified diff "@@ -1 +1 @@". |
Bram Moolenaar | 0059074 | 2019-02-15 21:06:09 +0100 | [diff] [blame] | 1081 | if (vim_fgets(linebuf, LBUFLEN, fd)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1082 | break; |
glacambre | ad5c178 | 2021-05-24 14:20:53 +0200 | [diff] [blame] | 1083 | if (STRNCMP(linebuf, "1c1", 3) == 0 |
| 1084 | || STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1085 | ok = TRUE; |
| 1086 | } |
| 1087 | fclose(fd); |
| 1088 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1089 | mch_remove(diffio->dio_diff.dout_fname); |
| 1090 | mch_remove(diffio->dio_new.din_fname); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1091 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1092 | mch_remove(diffio->dio_orig.din_fname); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1093 | } |
| 1094 | |
| 1095 | #ifdef FEAT_EVAL |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1096 | // When using 'diffexpr' break here. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1097 | if (*p_dex != NUL) |
| 1098 | break; |
| 1099 | #endif |
| 1100 | |
Bram Moolenaar | 48e330a | 2016-02-23 14:53:34 +0100 | [diff] [blame] | 1101 | #if defined(MSWIN) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1102 | // If the "-a" argument works, also check if "--binary" works. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1103 | if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE) |
| 1104 | { |
| 1105 | diff_a_works = TRUE; |
| 1106 | diff_bin_works = TRUE; |
| 1107 | continue; |
| 1108 | } |
| 1109 | if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE) |
| 1110 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1111 | // Tried --binary, but it failed. "-a" works though. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1112 | diff_bin_works = FALSE; |
| 1113 | ok = TRUE; |
| 1114 | } |
| 1115 | #endif |
| 1116 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1117 | // If we checked if "-a" works already, break here. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1118 | if (diff_a_works != MAYBE) |
| 1119 | break; |
| 1120 | diff_a_works = ok; |
| 1121 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1122 | // If "-a" works break here, otherwise retry without "-a". |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1123 | if (ok) |
| 1124 | break; |
| 1125 | } |
| 1126 | if (!ok) |
| 1127 | { |
Bram Moolenaar | fe86f2d | 2008-11-28 20:29:07 +0000 | [diff] [blame] | 1128 | if (io_error) |
Bram Moolenaar | 9d00e4a | 2022-01-05 17:49:15 +0000 | [diff] [blame] | 1129 | emsg(_(e_cannot_read_or_write_temp_files)); |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 1130 | emsg(_(e_cannot_create_diffs)); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1131 | diff_a_works = MAYBE; |
Bram Moolenaar | 48e330a | 2016-02-23 14:53:34 +0100 | [diff] [blame] | 1132 | #if defined(MSWIN) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1133 | diff_bin_works = MAYBE; |
| 1134 | #endif |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1135 | return FAIL; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1136 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1137 | return OK; |
| 1138 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1139 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1140 | /* |
| 1141 | * Invoke the xdiff function. |
| 1142 | */ |
| 1143 | static int |
| 1144 | diff_file_internal(diffio_T *diffio) |
| 1145 | { |
| 1146 | xpparam_t param; |
| 1147 | xdemitconf_t emit_cfg; |
| 1148 | xdemitcb_t emit_cb; |
Bram Moolenaar | bd1d560 | 2012-05-18 18:47:17 +0200 | [diff] [blame] | 1149 | |
Bram Moolenaar | a80faa8 | 2020-04-12 19:37:17 +0200 | [diff] [blame] | 1150 | CLEAR_FIELD(param); |
| 1151 | CLEAR_FIELD(emit_cfg); |
| 1152 | CLEAR_FIELD(emit_cb); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1153 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1154 | param.flags = diff_algorithm; |
| 1155 | |
| 1156 | if (diff_flags & DIFF_IWHITE) |
| 1157 | param.flags |= XDF_IGNORE_WHITESPACE_CHANGE; |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 1158 | if (diff_flags & DIFF_IWHITEALL) |
| 1159 | param.flags |= XDF_IGNORE_WHITESPACE; |
| 1160 | if (diff_flags & DIFF_IWHITEEOL) |
| 1161 | param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL; |
| 1162 | if (diff_flags & DIFF_IBLANK) |
| 1163 | param.flags |= XDF_IGNORE_BLANK_LINES; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1164 | |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 1165 | emit_cfg.ctxlen = diffio->dio_ctxlen; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1166 | emit_cb.priv = &diffio->dio_diff; |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 1167 | if (diffio->dio_outfmt == DIO_OUTPUT_INDICES) |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 1168 | emit_cfg.hunk_func = xdiff_out_indices; |
| 1169 | else |
| 1170 | emit_cb.out_line = xdiff_out_unified; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1171 | if (xdl_diff(&diffio->dio_orig.din_mmfile, |
| 1172 | &diffio->dio_new.din_mmfile, |
| 1173 | ¶m, &emit_cfg, &emit_cb) < 0) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1174 | { |
Bram Moolenaar | d82a47d | 2022-01-05 20:24:39 +0000 | [diff] [blame] | 1175 | emsg(_(e_problem_creating_internal_diff)); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1176 | return FAIL; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1177 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1178 | return OK; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1179 | } |
| 1180 | |
| 1181 | /* |
| 1182 | * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff". |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1183 | * return OK or FAIL; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1184 | */ |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1185 | static int |
| 1186 | diff_file(diffio_T *dio) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1187 | { |
| 1188 | char_u *cmd; |
Bram Moolenaar | 5fd0ca7 | 2009-05-13 16:56:33 +0000 | [diff] [blame] | 1189 | size_t len; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1190 | char_u *tmp_orig = dio->dio_orig.din_fname; |
| 1191 | char_u *tmp_new = dio->dio_new.din_fname; |
| 1192 | char_u *tmp_diff = dio->dio_diff.dout_fname; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1193 | |
| 1194 | #ifdef FEAT_EVAL |
| 1195 | if (*p_dex != NUL) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1196 | { |
| 1197 | // Use 'diffexpr' to generate the diff file. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1198 | eval_diff(tmp_orig, tmp_new, tmp_diff); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1199 | return OK; |
| 1200 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1201 | else |
| 1202 | #endif |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1203 | // Use xdiff for generating the diff. |
| 1204 | if (dio->dio_internal) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1205 | return diff_file_internal(dio); |
Bram Moolenaar | 95fb60a | 2005-03-08 22:29:20 +0000 | [diff] [blame] | 1206 | |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1207 | len = STRLEN(tmp_orig) + STRLEN(tmp_new) |
| 1208 | + STRLEN(tmp_diff) + STRLEN(p_srr) + 27; |
| 1209 | cmd = alloc(len); |
| 1210 | if (cmd == NULL) |
| 1211 | return FAIL; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1212 | |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1213 | // We don't want $DIFF_OPTIONS to get in the way. |
| 1214 | if (getenv("DIFF_OPTIONS")) |
| 1215 | vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)""); |
| 1216 | |
| 1217 | // Build the diff command and execute it. Always use -a, binary |
| 1218 | // differences are of no use. Ignore errors, diff returns |
| 1219 | // non-zero when differences have been found. |
| 1220 | vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s", |
| 1221 | diff_a_works == FALSE ? "" : "-a ", |
Bram Moolenaar | 48e330a | 2016-02-23 14:53:34 +0100 | [diff] [blame] | 1222 | #if defined(MSWIN) |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1223 | diff_bin_works == TRUE ? "--binary " : "", |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1224 | #else |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1225 | "", |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1226 | #endif |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1227 | (diff_flags & DIFF_IWHITE) ? "-b " : "", |
| 1228 | (diff_flags & DIFF_IWHITEALL) ? "-w " : "", |
| 1229 | (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "", |
| 1230 | (diff_flags & DIFF_IBLANK) ? "-B " : "", |
| 1231 | (diff_flags & DIFF_ICASE) ? "-i " : "", |
| 1232 | tmp_orig, tmp_new); |
| 1233 | append_redir(cmd, (int)len, p_srr, tmp_diff); |
| 1234 | block_autocmds(); // avoid ShellCmdPost stuff |
| 1235 | (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT); |
| 1236 | unblock_autocmds(); |
| 1237 | vim_free(cmd); |
| 1238 | return OK; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1239 | } |
| 1240 | |
| 1241 | /* |
| 1242 | * Create a new version of a file from the current buffer and a diff file. |
| 1243 | * The buffer is written to a file, also for unmodified buffers (the file |
| 1244 | * could have been produced by autocommands, e.g. the netrw plugin). |
| 1245 | */ |
| 1246 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1247 | ex_diffpatch(exarg_T *eap) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1248 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1249 | char_u *tmp_orig; // name of original temp file |
| 1250 | char_u *tmp_new; // name of patched temp file |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1251 | char_u *buf = NULL; |
Bram Moolenaar | 5fd0ca7 | 2009-05-13 16:56:33 +0000 | [diff] [blame] | 1252 | size_t buflen; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1253 | win_T *old_curwin = curwin; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1254 | char_u *newname = NULL; // name of patched file buffer |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1255 | #ifdef UNIX |
| 1256 | char_u dirbuf[MAXPATHL]; |
| 1257 | char_u *fullname = NULL; |
| 1258 | #endif |
| 1259 | #ifdef FEAT_BROWSE |
| 1260 | char_u *browseFile = NULL; |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 1261 | int save_cmod_flags = cmdmod.cmod_flags; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1262 | #endif |
Bram Moolenaar | 8767f52 | 2016-07-01 17:17:39 +0200 | [diff] [blame] | 1263 | stat_T st; |
Bram Moolenaar | a95ab32 | 2017-03-11 19:21:53 +0100 | [diff] [blame] | 1264 | char_u *esc_name = NULL; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1265 | |
| 1266 | #ifdef FEAT_BROWSE |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 1267 | if (cmdmod.cmod_flags & CMOD_BROWSE) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1268 | { |
Bram Moolenaar | 7171abe | 2004-10-11 10:06:20 +0000 | [diff] [blame] | 1269 | browseFile = do_browse(0, (char_u *)_("Patch file"), |
Bram Moolenaar | c36651b | 2018-04-29 12:22:56 +0200 | [diff] [blame] | 1270 | eap->arg, NULL, NULL, |
| 1271 | (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1272 | if (browseFile == NULL) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1273 | return; // operation cancelled |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1274 | eap->arg = browseFile; |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 1275 | cmdmod.cmod_flags &= ~CMOD_BROWSE; // don't let do_ecmd() browse again |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1276 | } |
| 1277 | #endif |
| 1278 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1279 | // We need two temp file names. |
Bram Moolenaar | e5c421c | 2015-03-31 13:33:08 +0200 | [diff] [blame] | 1280 | tmp_orig = vim_tempname('o', FALSE); |
| 1281 | tmp_new = vim_tempname('n', FALSE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1282 | if (tmp_orig == NULL || tmp_new == NULL) |
| 1283 | goto theend; |
| 1284 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1285 | // Write the current buffer to "tmp_orig". |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1286 | if (buf_write(curbuf, tmp_orig, NULL, |
| 1287 | (linenr_T)1, curbuf->b_ml.ml_line_count, |
| 1288 | NULL, FALSE, FALSE, FALSE, TRUE) == FAIL) |
| 1289 | goto theend; |
| 1290 | |
| 1291 | #ifdef UNIX |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1292 | // Get the absolute path of the patchfile, changing directory below. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1293 | fullname = FullName_save(eap->arg, FALSE); |
| 1294 | #endif |
Bram Moolenaar | a95ab32 | 2017-03-11 19:21:53 +0100 | [diff] [blame] | 1295 | esc_name = vim_strsave_shellescape( |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1296 | # ifdef UNIX |
Bram Moolenaar | a95ab32 | 2017-03-11 19:21:53 +0100 | [diff] [blame] | 1297 | fullname != NULL ? fullname : |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1298 | # endif |
Bram Moolenaar | a95ab32 | 2017-03-11 19:21:53 +0100 | [diff] [blame] | 1299 | eap->arg, TRUE, TRUE); |
| 1300 | if (esc_name == NULL) |
| 1301 | goto theend; |
| 1302 | buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16; |
Bram Moolenaar | 964b374 | 2019-05-24 18:54:09 +0200 | [diff] [blame] | 1303 | buf = alloc(buflen); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1304 | if (buf == NULL) |
| 1305 | goto theend; |
| 1306 | |
| 1307 | #ifdef UNIX |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1308 | // Temporarily chdir to /tmp, to avoid patching files in the current |
| 1309 | // directory when the patch file contains more than one patch. When we |
| 1310 | // have our own temp dir use that instead, it will be cleaned up when we |
| 1311 | // exit (any .rej files created). Don't change directory if we can't |
| 1312 | // return to the current. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1313 | if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0) |
| 1314 | dirbuf[0] = NUL; |
| 1315 | else |
| 1316 | { |
| 1317 | # ifdef TEMPDIRNAMES |
| 1318 | if (vim_tempdir != NULL) |
Bram Moolenaar | 42335f5 | 2018-09-13 15:33:43 +0200 | [diff] [blame] | 1319 | vim_ignored = mch_chdir((char *)vim_tempdir); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1320 | else |
| 1321 | # endif |
Bram Moolenaar | 42335f5 | 2018-09-13 15:33:43 +0200 | [diff] [blame] | 1322 | vim_ignored = mch_chdir("/tmp"); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1323 | shorten_fnames(TRUE); |
| 1324 | } |
| 1325 | #endif |
| 1326 | |
| 1327 | #ifdef FEAT_EVAL |
| 1328 | if (*p_pex != NUL) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1329 | // Use 'patchexpr' to generate the new file. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1330 | eval_patch(tmp_orig, |
| 1331 | # ifdef UNIX |
| 1332 | fullname != NULL ? fullname : |
| 1333 | # endif |
| 1334 | eap->arg, tmp_new); |
| 1335 | else |
| 1336 | #endif |
| 1337 | { |
Bram Moolenaar | 23a971d | 2023-04-04 22:04:53 +0100 | [diff] [blame] | 1338 | if (check_restricted()) |
| 1339 | goto theend; |
| 1340 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1341 | // Build the patch command and execute it. Ignore errors. Switch to |
| 1342 | // cooked mode to allow the user to respond to prompts. |
Bram Moolenaar | a95ab32 | 2017-03-11 19:21:53 +0100 | [diff] [blame] | 1343 | vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s", |
| 1344 | tmp_new, tmp_orig, esc_name); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1345 | block_autocmds(); // Avoid ShellCmdPost stuff |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1346 | (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED); |
Bram Moolenaar | 78ab331 | 2007-09-29 12:16:41 +0000 | [diff] [blame] | 1347 | unblock_autocmds(); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1348 | } |
| 1349 | |
| 1350 | #ifdef UNIX |
| 1351 | if (dirbuf[0] != NUL) |
| 1352 | { |
| 1353 | if (mch_chdir((char *)dirbuf) != 0) |
Bram Moolenaar | 460ae5d | 2022-01-01 14:19:49 +0000 | [diff] [blame] | 1354 | emsg(_(e_cannot_go_back_to_previous_directory)); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1355 | shorten_fnames(TRUE); |
| 1356 | } |
| 1357 | #endif |
| 1358 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1359 | // patch probably has written over the screen |
Bram Moolenaar | a4d158b | 2022-08-14 14:17:45 +0100 | [diff] [blame] | 1360 | redraw_later(UPD_CLEAR); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1361 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1362 | // Delete any .orig or .rej file created. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1363 | STRCPY(buf, tmp_new); |
| 1364 | STRCAT(buf, ".orig"); |
| 1365 | mch_remove(buf); |
| 1366 | STRCPY(buf, tmp_new); |
| 1367 | STRCAT(buf, ".rej"); |
| 1368 | mch_remove(buf); |
| 1369 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1370 | // Only continue if the output file was created. |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1371 | if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0) |
Bram Moolenaar | 9d00e4a | 2022-01-05 17:49:15 +0000 | [diff] [blame] | 1372 | emsg(_(e_cannot_read_patch_output)); |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1373 | else |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1374 | { |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1375 | if (curbuf->b_fname != NULL) |
| 1376 | { |
| 1377 | newname = vim_strnsave(curbuf->b_fname, |
Bram Moolenaar | df44a27 | 2020-06-07 20:49:05 +0200 | [diff] [blame] | 1378 | STRLEN(curbuf->b_fname) + 4); |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1379 | if (newname != NULL) |
| 1380 | STRCAT(newname, ".new"); |
| 1381 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1382 | |
| 1383 | #ifdef FEAT_GUI |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1384 | need_mouse_correct = TRUE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1385 | #endif |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1386 | // don't use a new tab page, each tab page has its own diffs |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 1387 | cmdmod.cmod_tab = 0; |
Bram Moolenaar | 80a94a5 | 2006-02-23 21:26:58 +0000 | [diff] [blame] | 1388 | |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1389 | if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1390 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1391 | // Pretend it was a ":split fname" command |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1392 | eap->cmdidx = CMD_split; |
| 1393 | eap->arg = tmp_new; |
| 1394 | do_exedit(eap, old_curwin); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1395 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1396 | // check that split worked and editing tmp_new |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1397 | if (curwin != old_curwin && win_valid(old_curwin)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1398 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1399 | // Set 'diff', 'scrollbind' on and 'wrap' off. |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1400 | diff_win_options(curwin, TRUE); |
| 1401 | diff_win_options(old_curwin, TRUE); |
| 1402 | |
| 1403 | if (newname != NULL) |
| 1404 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1405 | // do a ":file filename.new" on the patched buffer |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1406 | eap->arg = newname; |
| 1407 | ex_file(eap); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1408 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1409 | // Do filetype detection with the new name. |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1410 | if (au_has_group((char_u *)"filetypedetect")) |
Bram Moolenaar | 23a971d | 2023-04-04 22:04:53 +0100 | [diff] [blame] | 1411 | do_cmdline_cmd( |
| 1412 | (char_u *)":doau filetypedetect BufRead"); |
Bram Moolenaar | 6ec0a6c | 2009-07-22 14:23:13 +0000 | [diff] [blame] | 1413 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1414 | } |
| 1415 | } |
| 1416 | } |
| 1417 | |
| 1418 | theend: |
| 1419 | if (tmp_orig != NULL) |
| 1420 | mch_remove(tmp_orig); |
| 1421 | vim_free(tmp_orig); |
| 1422 | if (tmp_new != NULL) |
| 1423 | mch_remove(tmp_new); |
| 1424 | vim_free(tmp_new); |
| 1425 | vim_free(newname); |
| 1426 | vim_free(buf); |
| 1427 | #ifdef UNIX |
| 1428 | vim_free(fullname); |
| 1429 | #endif |
Bram Moolenaar | a95ab32 | 2017-03-11 19:21:53 +0100 | [diff] [blame] | 1430 | vim_free(esc_name); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1431 | #ifdef FEAT_BROWSE |
| 1432 | vim_free(browseFile); |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 1433 | cmdmod.cmod_flags = save_cmod_flags; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1434 | #endif |
| 1435 | } |
| 1436 | |
| 1437 | /* |
| 1438 | * Split the window and edit another file, setting options to show the diffs. |
| 1439 | */ |
| 1440 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1441 | ex_diffsplit(exarg_T *eap) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1442 | { |
| 1443 | win_T *old_curwin = curwin; |
Bram Moolenaar | 7c0a2f3 | 2016-07-10 22:11:16 +0200 | [diff] [blame] | 1444 | bufref_T old_curbuf; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1445 | |
Bram Moolenaar | 7c0a2f3 | 2016-07-10 22:11:16 +0200 | [diff] [blame] | 1446 | set_bufref(&old_curbuf, curbuf); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1447 | #ifdef FEAT_GUI |
| 1448 | need_mouse_correct = TRUE; |
| 1449 | #endif |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1450 | // Need to compute w_fraction when no redraw happened yet. |
Bram Moolenaar | 46328f9 | 2016-08-28 15:39:57 +0200 | [diff] [blame] | 1451 | validate_cursor(); |
| 1452 | set_fraction(curwin); |
| 1453 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1454 | // don't use a new tab page, each tab page has its own diffs |
Bram Moolenaar | e100440 | 2020-10-24 20:49:43 +0200 | [diff] [blame] | 1455 | cmdmod.cmod_tab = 0; |
Bram Moolenaar | 80a94a5 | 2006-02-23 21:26:58 +0000 | [diff] [blame] | 1456 | |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1457 | if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) == FAIL) |
| 1458 | return; |
| 1459 | |
| 1460 | // Pretend it was a ":split fname" command |
| 1461 | eap->cmdidx = CMD_split; |
| 1462 | curwin->w_p_diff = TRUE; |
| 1463 | do_exedit(eap, old_curwin); |
| 1464 | |
| 1465 | if (curwin == old_curwin) // split didn't work |
| 1466 | return; |
| 1467 | |
| 1468 | // Set 'diff', 'scrollbind' on and 'wrap' off. |
| 1469 | diff_win_options(curwin, TRUE); |
| 1470 | if (win_valid(old_curwin)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1471 | { |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1472 | diff_win_options(old_curwin, TRUE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1473 | |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1474 | if (bufref_valid(&old_curbuf)) |
| 1475 | // Move the cursor position to that of the old window. |
| 1476 | curwin->w_cursor.lnum = diff_get_corresponding_line( |
| 1477 | old_curbuf.br_buf, old_curwin->w_cursor.lnum); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1478 | } |
Yegappan Lakshmanan | 465de3a | 2022-12-26 12:50:04 +0000 | [diff] [blame] | 1479 | // Now that lines are folded scroll to show the cursor at the same |
| 1480 | // relative position. |
| 1481 | scroll_to_fraction(curwin, curwin->w_height); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1482 | } |
| 1483 | |
| 1484 | /* |
Bram Moolenaar | 84a05ac | 2013-05-06 04:24:17 +0200 | [diff] [blame] | 1485 | * Set options to show diffs for the current window. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1486 | */ |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1487 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1488 | ex_diffthis(exarg_T *eap UNUSED) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1489 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1490 | // Set 'diff', 'scrollbind' on and 'wrap' off. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1491 | diff_win_options(curwin, TRUE); |
| 1492 | } |
| 1493 | |
Bram Moolenaar | 04f62f8 | 2017-07-19 18:18:39 +0200 | [diff] [blame] | 1494 | static void |
| 1495 | set_diff_option(win_T *wp, int value) |
| 1496 | { |
| 1497 | win_T *old_curwin = curwin; |
| 1498 | |
| 1499 | curwin = wp; |
| 1500 | curbuf = curwin->w_buffer; |
| 1501 | ++curbuf_lock; |
Bram Moolenaar | 31e5c60 | 2022-04-15 13:53:33 +0100 | [diff] [blame] | 1502 | set_option_value_give_err((char_u *)"diff", (long)value, NULL, OPT_LOCAL); |
Bram Moolenaar | 04f62f8 | 2017-07-19 18:18:39 +0200 | [diff] [blame] | 1503 | --curbuf_lock; |
| 1504 | curwin = old_curwin; |
| 1505 | curbuf = curwin->w_buffer; |
| 1506 | } |
| 1507 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1508 | /* |
| 1509 | * Set options in window "wp" for diff mode. |
| 1510 | */ |
| 1511 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1512 | diff_win_options( |
| 1513 | win_T *wp, |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1514 | int addbuf) // Add buffer to diff. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1515 | { |
Bram Moolenaar | f4d7f94 | 2010-02-24 14:34:19 +0100 | [diff] [blame] | 1516 | # ifdef FEAT_FOLDING |
| 1517 | win_T *old_curwin = curwin; |
| 1518 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1519 | // close the manually opened folds |
Bram Moolenaar | f4d7f94 | 2010-02-24 14:34:19 +0100 | [diff] [blame] | 1520 | curwin = wp; |
| 1521 | newFoldLevel(); |
| 1522 | curwin = old_curwin; |
| 1523 | # endif |
| 1524 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1525 | // Use 'scrollbind' and 'cursorbind' when available |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1526 | if (!wp->w_p_diff) |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1527 | wp->w_p_scb_save = wp->w_p_scb; |
Bram Moolenaar | 3368ea2 | 2010-09-21 16:56:35 +0200 | [diff] [blame] | 1528 | wp->w_p_scb = TRUE; |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1529 | if (!wp->w_p_diff) |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1530 | wp->w_p_crb_save = wp->w_p_crb; |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 1531 | wp->w_p_crb = TRUE; |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 1532 | if (!(diff_flags & DIFF_FOLLOWWRAP)) |
| 1533 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1534 | if (!wp->w_p_diff) |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 1535 | wp->w_p_wrap_save = wp->w_p_wrap; |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1536 | wp->w_p_wrap = FALSE; |
zeertzjq | 9e7f1fc | 2024-03-16 09:40:22 +0100 | [diff] [blame] | 1537 | wp->w_skipcol = 0; |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 1538 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1539 | # ifdef FEAT_FOLDING |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1540 | if (!wp->w_p_diff) |
| 1541 | { |
| 1542 | if (wp->w_p_diff_saved) |
| 1543 | free_string_option(wp->w_p_fdm_save); |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1544 | wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm); |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1545 | } |
Bram Moolenaar | 20c023a | 2019-05-26 21:03:24 +0200 | [diff] [blame] | 1546 | set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff", |
Bram Moolenaar | 5e3cb7e | 2006-02-27 23:58:35 +0000 | [diff] [blame] | 1547 | OPT_LOCAL|OPT_FREE, 0); |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1548 | if (!wp->w_p_diff) |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1549 | { |
| 1550 | wp->w_p_fdc_save = wp->w_p_fdc; |
| 1551 | wp->w_p_fen_save = wp->w_p_fen; |
| 1552 | wp->w_p_fdl_save = wp->w_p_fdl; |
| 1553 | } |
Bram Moolenaar | f4d7f94 | 2010-02-24 14:34:19 +0100 | [diff] [blame] | 1554 | wp->w_p_fdc = diff_foldcolumn; |
| 1555 | wp->w_p_fen = TRUE; |
| 1556 | wp->w_p_fdl = 0; |
| 1557 | foldUpdateAll(wp); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1558 | // make sure topline is not halfway a fold |
Bram Moolenaar | f4d7f94 | 2010-02-24 14:34:19 +0100 | [diff] [blame] | 1559 | changed_window_setting_win(wp); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1560 | # endif |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1561 | if (vim_strchr(p_sbo, 'h') == NULL) |
| 1562 | do_cmdline_cmd((char_u *)"set sbo+=hor"); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1563 | // Save the current values, to be restored in ex_diffoff(). |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1564 | wp->w_p_diff_saved = TRUE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1565 | |
Bram Moolenaar | 04f62f8 | 2017-07-19 18:18:39 +0200 | [diff] [blame] | 1566 | set_diff_option(wp, TRUE); |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1567 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1568 | if (addbuf) |
| 1569 | diff_buf_add(wp->w_buffer); |
Bram Moolenaar | a4d158b | 2022-08-14 14:17:45 +0100 | [diff] [blame] | 1570 | redraw_win_later(wp, UPD_NOT_VALID); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1571 | } |
| 1572 | |
| 1573 | /* |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1574 | * Set options not to show diffs. For the current window or all windows. |
Bram Moolenaar | f740b29 | 2006-02-16 22:11:02 +0000 | [diff] [blame] | 1575 | * Only in the current tab page. |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1576 | */ |
| 1577 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1578 | ex_diffoff(exarg_T *eap) |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1579 | { |
| 1580 | win_T *wp; |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1581 | int diffwin = FALSE; |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1582 | |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 1583 | FOR_ALL_WINDOWS(wp) |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1584 | { |
Bram Moolenaar | 00462ff | 2013-09-20 20:13:53 +0200 | [diff] [blame] | 1585 | if (eap->forceit ? wp->w_p_diff : wp == curwin) |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1586 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1587 | // Set 'diff' off. If option values were saved in |
| 1588 | // diff_win_options(), restore the ones whose settings seem to have |
| 1589 | // been left over from diff mode. |
Bram Moolenaar | 04f62f8 | 2017-07-19 18:18:39 +0200 | [diff] [blame] | 1590 | set_diff_option(wp, FALSE); |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1591 | |
Bram Moolenaar | a87aa80 | 2013-07-03 15:47:03 +0200 | [diff] [blame] | 1592 | if (wp->w_p_diff_saved) |
| 1593 | { |
Bram Moolenaar | 33ca6bf | 2013-07-17 13:43:39 +0200 | [diff] [blame] | 1594 | |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1595 | if (wp->w_p_scb) |
| 1596 | wp->w_p_scb = wp->w_p_scb_save; |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1597 | if (wp->w_p_crb) |
| 1598 | wp->w_p_crb = wp->w_p_crb_save; |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 1599 | if (!(diff_flags & DIFF_FOLLOWWRAP)) |
| 1600 | { |
zeertzjq | 9e7f1fc | 2024-03-16 09:40:22 +0100 | [diff] [blame] | 1601 | if (!wp->w_p_wrap && wp->w_p_wrap_save) |
| 1602 | { |
| 1603 | wp->w_p_wrap = TRUE; |
| 1604 | wp->w_leftcol = 0; |
| 1605 | } |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 1606 | } |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1607 | #ifdef FEAT_FOLDING |
| 1608 | free_string_option(wp->w_p_fdm); |
Bram Moolenaar | 79a213d | 2017-05-16 13:15:18 +0200 | [diff] [blame] | 1609 | wp->w_p_fdm = vim_strsave( |
| 1610 | *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual"); |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1611 | |
| 1612 | if (wp->w_p_fdc == diff_foldcolumn) |
| 1613 | wp->w_p_fdc = wp->w_p_fdc_save; |
| 1614 | if (wp->w_p_fdl == 0) |
| 1615 | wp->w_p_fdl = wp->w_p_fdl_save; |
| 1616 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1617 | // Only restore 'foldenable' when 'foldmethod' is not |
| 1618 | // "manual", otherwise we continue to show the diff folds. |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1619 | if (wp->w_p_fen) |
| 1620 | wp->w_p_fen = foldmethodIsManual(wp) ? FALSE |
| 1621 | : wp->w_p_fen_save; |
| 1622 | |
| 1623 | foldUpdateAll(wp); |
Bram Moolenaar | 4392996 | 2015-07-03 15:06:56 +0200 | [diff] [blame] | 1624 | #endif |
Bram Moolenaar | 33ca6bf | 2013-07-17 13:43:39 +0200 | [diff] [blame] | 1625 | } |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1626 | // remove filler lines |
Bram Moolenaar | e67d546 | 2016-08-27 22:40:42 +0200 | [diff] [blame] | 1627 | wp->w_topfill = 0; |
| 1628 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1629 | // make sure topline is not halfway a fold and cursor is |
| 1630 | // invalidated |
Bram Moolenaar | e67d546 | 2016-08-27 22:40:42 +0200 | [diff] [blame] | 1631 | changed_window_setting_win(wp); |
Bram Moolenaar | 33ca6bf | 2013-07-17 13:43:39 +0200 | [diff] [blame] | 1632 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1633 | // Note: 'sbo' is not restored, it's a global option. |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1634 | diff_buf_adjust(wp); |
| 1635 | } |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1636 | diffwin |= wp->w_p_diff; |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1637 | } |
| 1638 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1639 | // Also remove hidden buffers from the list. |
Bram Moolenaar | 25ea054 | 2017-02-03 23:16:28 +0100 | [diff] [blame] | 1640 | if (eap->forceit) |
| 1641 | diff_buf_clear(); |
| 1642 | |
Bram Moolenaar | c823477 | 2019-11-10 21:00:27 +0100 | [diff] [blame] | 1643 | if (!diffwin) |
| 1644 | { |
| 1645 | diff_need_update = FALSE; |
| 1646 | curtab->tp_diff_invalid = FALSE; |
| 1647 | curtab->tp_diff_update = FALSE; |
| 1648 | diff_clear(curtab); |
| 1649 | } |
| 1650 | |
Dominique Pelle | af4a61a | 2021-12-27 17:21:41 +0000 | [diff] [blame] | 1651 | // Remove "hor" from 'scrollopt' if there are no diff windows left. |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1652 | if (!diffwin && vim_strchr(p_sbo, 'h') != NULL) |
| 1653 | do_cmdline_cmd((char_u *)"set sbo-=hor"); |
Bram Moolenaar | 2df6dcc | 2004-07-12 15:53:54 +0000 | [diff] [blame] | 1654 | } |
| 1655 | |
| 1656 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1657 | * Read the diff output and add each entry to the diff list. |
| 1658 | */ |
| 1659 | static void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1660 | diff_read( |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1661 | int idx_orig, // idx of original file |
| 1662 | int idx_new, // idx of new file |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1663 | diffio_T *dio) // diff output |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1664 | { |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1665 | FILE *fd = NULL; |
| 1666 | int line_idx = 0; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1667 | diff_T *dprev = NULL; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1668 | diff_T *dp = curtab->tp_first_diff; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1669 | diff_T *dn, *dpl; |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1670 | diffout_T *dout = &dio->dio_diff; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1671 | char_u linebuf[LBUFLEN]; // only need to hold the diff line |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1672 | char_u *line; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1673 | long off; |
| 1674 | int i; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 1675 | int notset = TRUE; // block "*dp" not set yet |
Bram Moolenaar | 4916697 | 2021-12-30 10:51:45 +0000 | [diff] [blame] | 1676 | diffhunk_T *hunk = NULL; // init to avoid gcc warning |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1677 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1678 | enum { |
| 1679 | DIFF_ED, |
| 1680 | DIFF_UNIFIED, |
| 1681 | DIFF_NONE |
| 1682 | } diffstyle = DIFF_NONE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1683 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1684 | if (dout->dout_fname == NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1685 | { |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1686 | diffstyle = DIFF_UNIFIED; |
| 1687 | } |
| 1688 | else |
| 1689 | { |
| 1690 | fd = mch_fopen((char *)dout->dout_fname, "r"); |
| 1691 | if (fd == NULL) |
| 1692 | { |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 1693 | emsg(_(e_cannot_read_diff_output)); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1694 | return; |
| 1695 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1696 | } |
| 1697 | |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1698 | if (!dio->dio_internal) |
| 1699 | { |
| 1700 | hunk = ALLOC_ONE(diffhunk_T); |
| 1701 | if (hunk == NULL) |
Bram Moolenaar | 5d46dcf | 2022-03-25 14:46:47 +0000 | [diff] [blame] | 1702 | { |
| 1703 | if (fd != NULL) |
| 1704 | fclose(fd); |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1705 | return; |
Bram Moolenaar | 5d46dcf | 2022-03-25 14:46:47 +0000 | [diff] [blame] | 1706 | } |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1707 | } |
| 1708 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1709 | for (;;) |
| 1710 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1711 | if (dio->dio_internal) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1712 | { |
Bram Moolenaar | ebfec1c | 2023-01-22 21:14:53 +0000 | [diff] [blame] | 1713 | if (line_idx >= dout->dout_ga.ga_len) |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1714 | break; // did last line |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1715 | hunk = ((diffhunk_T **)dout->dout_ga.ga_data)[line_idx++]; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1716 | } |
| 1717 | else |
| 1718 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1719 | if (fd == NULL) |
| 1720 | { |
| 1721 | if (line_idx >= dout->dout_ga.ga_len) |
| 1722 | break; // did last line |
| 1723 | line = ((char_u **)dout->dout_ga.ga_data)[line_idx++]; |
| 1724 | } |
Bram Moolenaar | 3b8defd | 2018-09-13 13:03:11 +0200 | [diff] [blame] | 1725 | else |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1726 | { |
| 1727 | if (vim_fgets(linebuf, LBUFLEN, fd)) |
| 1728 | break; // end of file |
| 1729 | line = linebuf; |
| 1730 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1731 | |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1732 | if (diffstyle == DIFF_NONE) |
| 1733 | { |
| 1734 | // Determine diff style. |
| 1735 | // ed like diff looks like this: |
| 1736 | // {first}[,{last}]c{first}[,{last}] |
| 1737 | // {first}a{first}[,{last}] |
| 1738 | // {first}[,{last}]d{first} |
| 1739 | // |
| 1740 | // unified diff looks like this: |
| 1741 | // --- file1 2018-03-20 13:23:35.783153140 +0100 |
| 1742 | // +++ file2 2018-03-20 13:23:41.183156066 +0100 |
| 1743 | // @@ -1,3 +1,5 @@ |
Keith Thompson | 184f71c | 2024-01-04 21:19:04 +0100 | [diff] [blame] | 1744 | if (SAFE_isdigit(*line)) |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1745 | diffstyle = DIFF_ED; |
| 1746 | else if ((STRNCMP(line, "@@ ", 3) == 0)) |
| 1747 | diffstyle = DIFF_UNIFIED; |
| 1748 | else if ((STRNCMP(line, "--- ", 4) == 0) |
| 1749 | && (vim_fgets(linebuf, LBUFLEN, fd) == 0) |
| 1750 | && (STRNCMP(line, "+++ ", 4) == 0) |
| 1751 | && (vim_fgets(linebuf, LBUFLEN, fd) == 0) |
| 1752 | && (STRNCMP(line, "@@ ", 3) == 0)) |
| 1753 | diffstyle = DIFF_UNIFIED; |
| 1754 | else |
| 1755 | // Format not recognized yet, skip over this line. Cygwin |
| 1756 | // diff may put a warning at the start of the file. |
| 1757 | continue; |
| 1758 | } |
| 1759 | |
| 1760 | if (diffstyle == DIFF_ED) |
| 1761 | { |
Keith Thompson | 184f71c | 2024-01-04 21:19:04 +0100 | [diff] [blame] | 1762 | if (!SAFE_isdigit(*line)) |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1763 | continue; // not the start of a diff block |
| 1764 | if (parse_diff_ed(line, hunk) == FAIL) |
| 1765 | continue; |
| 1766 | } |
| 1767 | else if (diffstyle == DIFF_UNIFIED) |
| 1768 | { |
| 1769 | if (STRNCMP(line, "@@ ", 3) != 0) |
| 1770 | continue; // not the start of a diff block |
| 1771 | if (parse_diff_unified(line, hunk) == FAIL) |
| 1772 | continue; |
| 1773 | } |
| 1774 | else |
| 1775 | { |
Bram Moolenaar | d82a47d | 2022-01-05 20:24:39 +0000 | [diff] [blame] | 1776 | emsg(_(e_invalid_diff_format)); |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1777 | break; |
| 1778 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1779 | } |
| 1780 | |
| 1781 | // Go over blocks before the change, for which orig and new are equal. |
| 1782 | // Copy blocks from orig to new. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1783 | while (dp != NULL |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1784 | && hunk->lnum_orig > dp->df_lnum[idx_orig] |
| 1785 | + dp->df_count[idx_orig]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1786 | { |
| 1787 | if (notset) |
| 1788 | diff_copy_entry(dprev, dp, idx_orig, idx_new); |
| 1789 | dprev = dp; |
| 1790 | dp = dp->df_next; |
| 1791 | notset = TRUE; |
| 1792 | } |
| 1793 | |
| 1794 | if (dp != NULL |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1795 | && hunk->lnum_orig <= dp->df_lnum[idx_orig] |
| 1796 | + dp->df_count[idx_orig] |
| 1797 | && hunk->lnum_orig + hunk->count_orig >= dp->df_lnum[idx_orig]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1798 | { |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1799 | // New block overlaps with existing block(s). |
| 1800 | // First find last block that overlaps. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1801 | for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next) |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1802 | if (hunk->lnum_orig + hunk->count_orig |
| 1803 | < dpl->df_next->df_lnum[idx_orig]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1804 | break; |
| 1805 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1806 | // If the newly found block starts before the old one, set the |
| 1807 | // start back a number of lines. |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1808 | off = dp->df_lnum[idx_orig] - hunk->lnum_orig; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1809 | if (off > 0) |
| 1810 | { |
| 1811 | for (i = idx_orig; i < idx_new; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1812 | if (curtab->tp_diffbuf[i] != NULL) |
Yukihiro Nakadaira | 06fe70c | 2024-09-26 16:19:42 +0200 | [diff] [blame] | 1813 | { |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1814 | dp->df_lnum[i] -= off; |
Yukihiro Nakadaira | 06fe70c | 2024-09-26 16:19:42 +0200 | [diff] [blame] | 1815 | dp->df_count[i] += off; |
| 1816 | } |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1817 | dp->df_lnum[idx_new] = hunk->lnum_new; |
| 1818 | dp->df_count[idx_new] = hunk->count_new; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1819 | } |
| 1820 | else if (notset) |
| 1821 | { |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1822 | // new block inside existing one, adjust new block |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1823 | dp->df_lnum[idx_new] = hunk->lnum_new + off; |
| 1824 | dp->df_count[idx_new] = hunk->count_new - off; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1825 | } |
| 1826 | else |
Yukihiro Nakadaira | 01f6509 | 2025-01-15 18:36:43 +0100 | [diff] [blame] | 1827 | { |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1828 | // second overlap of new block with existing block |
Yukihiro Nakadaira | 06fe70c | 2024-09-26 16:19:42 +0200 | [diff] [blame] | 1829 | dp->df_count[idx_new] += hunk->count_new; |
Yukihiro Nakadaira | 01f6509 | 2025-01-15 18:36:43 +0100 | [diff] [blame] | 1830 | if ((dp->df_lnum[idx_new] + dp->df_count[idx_new] - 1) |
| 1831 | > curtab->tp_diffbuf[idx_new]->b_ml.ml_line_count) |
| 1832 | dp->df_count[idx_new] = curtab->tp_diffbuf[idx_new]->b_ml.ml_line_count |
| 1833 | - dp->df_lnum[idx_new] + 1; |
| 1834 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1835 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1836 | // Adjust the size of the block to include all the lines to the |
| 1837 | // end of the existing block or the new diff, whatever ends last. |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1838 | off = (hunk->lnum_orig + hunk->count_orig) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1839 | - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]); |
| 1840 | if (off < 0) |
| 1841 | { |
Yukihiro Nakadaira | 06fe70c | 2024-09-26 16:19:42 +0200 | [diff] [blame] | 1842 | // new change ends in existing block, adjust the end |
| 1843 | dp->df_count[idx_new] += -off; |
Yukihiro Nakadaira | 01f6509 | 2025-01-15 18:36:43 +0100 | [diff] [blame] | 1844 | if ((dp->df_lnum[idx_new] + dp->df_count[idx_new] - 1) |
| 1845 | > curtab->tp_diffbuf[idx_new]->b_ml.ml_line_count) |
| 1846 | dp->df_count[idx_new] = curtab->tp_diffbuf[idx_new]->b_ml.ml_line_count |
| 1847 | - dp->df_lnum[idx_new] + 1; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1848 | off = 0; |
| 1849 | } |
Bram Moolenaar | d4b96bc | 2007-10-19 15:33:39 +0000 | [diff] [blame] | 1850 | for (i = idx_orig; i < idx_new; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1851 | if (curtab->tp_diffbuf[i] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1852 | dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] |
| 1853 | - dp->df_lnum[i] + off; |
| 1854 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1855 | // Delete the diff blocks that have been merged into one. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1856 | dn = dp->df_next; |
| 1857 | dp->df_next = dpl->df_next; |
| 1858 | while (dn != dp->df_next) |
| 1859 | { |
| 1860 | dpl = dn->df_next; |
| 1861 | vim_free(dn); |
| 1862 | dn = dpl; |
| 1863 | } |
| 1864 | } |
| 1865 | else |
| 1866 | { |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1867 | // Allocate a new diffblock. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1868 | dp = diff_alloc_new(curtab, dprev, dp); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1869 | if (dp == NULL) |
Bram Moolenaar | eb3593b | 2006-04-22 22:33:57 +0000 | [diff] [blame] | 1870 | goto done; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1871 | |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1872 | dp->df_lnum[idx_orig] = hunk->lnum_orig; |
| 1873 | dp->df_count[idx_orig] = hunk->count_orig; |
| 1874 | dp->df_lnum[idx_new] = hunk->lnum_new; |
| 1875 | dp->df_count[idx_new] = hunk->count_new; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1876 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1877 | // Set values for other buffers, these must be equal to the |
| 1878 | // original buffer, otherwise there would have been a change |
| 1879 | // already. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1880 | for (i = idx_orig + 1; i < idx_new; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1881 | if (curtab->tp_diffbuf[i] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1882 | diff_copy_entry(dprev, dp, idx_orig, i); |
| 1883 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1884 | notset = FALSE; // "*dp" has been set |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1885 | } |
| 1886 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1887 | // for remaining diff blocks orig and new are equal |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1888 | while (dp != NULL) |
| 1889 | { |
| 1890 | if (notset) |
| 1891 | diff_copy_entry(dprev, dp, idx_orig, idx_new); |
| 1892 | dprev = dp; |
| 1893 | dp = dp->df_next; |
| 1894 | notset = TRUE; |
| 1895 | } |
| 1896 | |
Bram Moolenaar | eb3593b | 2006-04-22 22:33:57 +0000 | [diff] [blame] | 1897 | done: |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 1898 | if (!dio->dio_internal) |
| 1899 | vim_free(hunk); |
| 1900 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 1901 | if (fd != NULL) |
| 1902 | fclose(fd); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1903 | } |
| 1904 | |
| 1905 | /* |
| 1906 | * Copy an entry at "dp" from "idx_orig" to "idx_new". |
| 1907 | */ |
| 1908 | static void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1909 | diff_copy_entry( |
| 1910 | diff_T *dprev, |
| 1911 | diff_T *dp, |
| 1912 | int idx_orig, |
| 1913 | int idx_new) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1914 | { |
| 1915 | long off; |
| 1916 | |
| 1917 | if (dprev == NULL) |
| 1918 | off = 0; |
| 1919 | else |
| 1920 | off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig]) |
| 1921 | - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]); |
| 1922 | dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off; |
| 1923 | dp->df_count[idx_new] = dp->df_count[idx_orig]; |
| 1924 | } |
| 1925 | |
| 1926 | /* |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1927 | * Clear the list of diffblocks for tab page "tp". |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1928 | */ |
Bram Moolenaar | ea40885 | 2005-06-25 22:49:46 +0000 | [diff] [blame] | 1929 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 1930 | diff_clear(tabpage_T *tp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1931 | { |
| 1932 | diff_T *p, *next_p; |
| 1933 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1934 | for (p = tp->tp_first_diff; p != NULL; p = next_p) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1935 | { |
| 1936 | next_p = p->df_next; |
| 1937 | vim_free(p); |
| 1938 | } |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 1939 | tp->tp_first_diff = NULL; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 1940 | } |
| 1941 | |
| 1942 | /* |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 1943 | * return true if the options are set to use diff linematch |
| 1944 | */ |
| 1945 | static int |
| 1946 | diff_linematch(diff_T *dp) |
| 1947 | { |
| 1948 | if (!(diff_flags & DIFF_LINEMATCH)) |
| 1949 | return 0; |
| 1950 | |
| 1951 | // are there more than three diff buffers? |
| 1952 | int tsize = 0; |
| 1953 | for (int i = 0; i < DB_COUNT; i++) |
| 1954 | { |
| 1955 | if (curtab->tp_diffbuf[i] != NULL) |
| 1956 | { |
| 1957 | // for the rare case (bug?) that the count of a diff block is |
| 1958 | // negative, do not run the algorithm because this will try to |
| 1959 | // allocate a negative amount of space and crash |
| 1960 | if (dp->df_count[i] < 0) |
| 1961 | return FALSE; |
| 1962 | tsize += dp->df_count[i]; |
| 1963 | } |
| 1964 | } |
| 1965 | |
| 1966 | // avoid allocating a huge array because it will lag |
| 1967 | return tsize <= linematch_lines; |
| 1968 | } |
| 1969 | |
| 1970 | static int |
| 1971 | get_max_diff_length(const diff_T *dp) |
| 1972 | { |
| 1973 | int maxlength = 0; |
| 1974 | |
| 1975 | for (int k = 0; k < DB_COUNT; k++) |
| 1976 | { |
| 1977 | if (curtab->tp_diffbuf[k] != NULL) |
| 1978 | { |
| 1979 | if (dp->df_count[k] > maxlength) |
| 1980 | maxlength = dp->df_count[k]; |
| 1981 | } |
| 1982 | } |
| 1983 | return maxlength; |
| 1984 | } |
| 1985 | |
| 1986 | static void |
| 1987 | find_top_diff_block( |
| 1988 | diff_T **thistopdiff, |
| 1989 | diff_T **nextblockblock, |
| 1990 | int fromidx, |
| 1991 | int topline) |
| 1992 | { |
| 1993 | diff_T *topdiff = NULL; |
| 1994 | diff_T *localtopdiff = NULL; |
| 1995 | int topdiffchange = 0; |
| 1996 | |
| 1997 | for (topdiff = curtab->tp_first_diff; topdiff != NULL; |
| 1998 | topdiff = topdiff->df_next) |
| 1999 | { |
| 2000 | // set the top of the current overlapping diff block set as we |
| 2001 | // iterate through all of the sets of overlapping diff blocks |
| 2002 | if (!localtopdiff || topdiffchange) |
| 2003 | { |
| 2004 | localtopdiff = topdiff; |
| 2005 | topdiffchange = 0; |
| 2006 | } |
| 2007 | |
| 2008 | // check if the fromwin topline is matched by the current diff. if so, |
| 2009 | // set it to the top of the diff block |
| 2010 | if (topline >= topdiff->df_lnum[fromidx] && topline <= |
| 2011 | (topdiff->df_lnum[fromidx] + topdiff->df_count[fromidx])) |
| 2012 | { |
| 2013 | // this line is inside the current diff block, so we will save the |
| 2014 | // top block of the set of blocks to refer to later |
| 2015 | if ((*thistopdiff) == NULL) |
| 2016 | (*thistopdiff) = localtopdiff; |
| 2017 | } |
| 2018 | |
| 2019 | // check if the next set of overlapping diff blocks is next |
| 2020 | if (!(topdiff->df_next && (topdiff->df_next->df_lnum[fromidx] == |
| 2021 | (topdiff->df_lnum[fromidx] + |
| 2022 | topdiff->df_count[fromidx])))) |
| 2023 | { |
| 2024 | // mark that the next diff block is belongs to a different set of |
| 2025 | // overlapping diff blocks |
| 2026 | topdiffchange = 1; |
| 2027 | |
| 2028 | // if we already have found that the line number is inside a diff |
| 2029 | // block, set the marker of the next block and finish the iteration |
| 2030 | if (*thistopdiff) |
| 2031 | { |
| 2032 | (*nextblockblock) = topdiff->df_next; |
| 2033 | break; |
| 2034 | } |
| 2035 | } |
| 2036 | } |
| 2037 | } |
| 2038 | |
| 2039 | static void |
| 2040 | count_filler_lines_and_topline( |
| 2041 | int *curlinenum_to, |
| 2042 | int *linesfiller, |
| 2043 | const diff_T *thistopdiff, |
| 2044 | const int toidx, |
| 2045 | int virtual_lines_passed) |
| 2046 | { |
| 2047 | const diff_T *curdif = thistopdiff; |
| 2048 | int ch_virtual_lines = 0; |
| 2049 | int isfiller = FALSE; |
| 2050 | |
| 2051 | while (virtual_lines_passed > 0) |
| 2052 | { |
| 2053 | if (ch_virtual_lines) |
| 2054 | { |
| 2055 | virtual_lines_passed--; |
| 2056 | ch_virtual_lines--; |
| 2057 | if (!isfiller) |
| 2058 | (*curlinenum_to)++; |
| 2059 | else |
| 2060 | (*linesfiller)++; |
| 2061 | } |
| 2062 | else |
| 2063 | { |
| 2064 | (*linesfiller) = 0; |
Christian Brabandt | a9f77be | 2025-01-16 19:06:57 +0100 | [diff] [blame] | 2065 | if (curdif) |
| 2066 | { |
| 2067 | ch_virtual_lines = get_max_diff_length(curdif); |
| 2068 | isfiller = (curdif->df_count[toidx] ? FALSE : TRUE); |
| 2069 | } |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2070 | if (isfiller) |
| 2071 | { |
| 2072 | while (curdif && curdif->df_next && |
| 2073 | curdif->df_lnum[toidx] == |
| 2074 | curdif->df_next->df_lnum[toidx] && |
| 2075 | curdif->df_next->df_count[toidx] == 0) |
| 2076 | { |
| 2077 | curdif = curdif->df_next; |
| 2078 | ch_virtual_lines += get_max_diff_length(curdif); |
| 2079 | } |
| 2080 | } |
| 2081 | if (curdif) |
| 2082 | curdif = curdif->df_next; |
| 2083 | } |
| 2084 | } |
| 2085 | } |
| 2086 | |
| 2087 | static void |
| 2088 | calculate_topfill_and_topline( |
| 2089 | const int fromidx, |
| 2090 | const int toidx, |
| 2091 | const int from_topline, |
| 2092 | const int from_topfill, |
| 2093 | int *topfill, |
| 2094 | linenr_T *topline) |
| 2095 | { |
| 2096 | // 1. find the position from the top of the diff block, and the start |
| 2097 | // of the next diff block |
| 2098 | diff_T *thistopdiff = NULL; |
| 2099 | diff_T *nextblockblock = NULL; |
| 2100 | int virtual_lines_passed = 0; |
| 2101 | |
| 2102 | find_top_diff_block(&thistopdiff, &nextblockblock, fromidx, from_topline); |
| 2103 | |
| 2104 | // count the virtual lines that have been passed |
| 2105 | diff_T *curdif = thistopdiff; |
| 2106 | while (curdif && (curdif->df_lnum[fromidx] + curdif->df_count[fromidx]) |
| 2107 | <= from_topline) |
| 2108 | { |
| 2109 | virtual_lines_passed += get_max_diff_length(curdif); |
| 2110 | |
| 2111 | curdif = curdif->df_next; |
| 2112 | } |
| 2113 | |
| 2114 | if (curdif != nextblockblock) |
| 2115 | virtual_lines_passed += from_topline - curdif->df_lnum[fromidx]; |
| 2116 | virtual_lines_passed -= from_topfill; |
| 2117 | |
| 2118 | // count the same amount of virtual lines in the toidx buffer |
| 2119 | int curlinenum_to = thistopdiff->df_lnum[toidx]; |
| 2120 | int linesfiller = 0; |
| 2121 | |
| 2122 | count_filler_lines_and_topline(&curlinenum_to, &linesfiller, thistopdiff, |
| 2123 | toidx, virtual_lines_passed); |
| 2124 | |
| 2125 | // count the number of filler lines that would normally be above this line |
| 2126 | int maxfiller = 0; |
| 2127 | for (diff_T *dpfillertest = thistopdiff; dpfillertest != NULL; |
| 2128 | dpfillertest = dpfillertest->df_next) |
| 2129 | { |
| 2130 | if (dpfillertest->df_lnum[toidx] == curlinenum_to) |
| 2131 | { |
| 2132 | while (dpfillertest && dpfillertest->df_lnum[toidx] == |
| 2133 | curlinenum_to) |
| 2134 | { |
| 2135 | maxfiller += dpfillertest->df_count[toidx] ? 0 : |
| 2136 | get_max_diff_length(dpfillertest); |
| 2137 | dpfillertest = dpfillertest->df_next; |
| 2138 | } |
| 2139 | break; |
| 2140 | } |
| 2141 | } |
| 2142 | (*topfill) = maxfiller - linesfiller; |
| 2143 | (*topline) = curlinenum_to; |
| 2144 | } |
| 2145 | |
| 2146 | static int |
| 2147 | linematched_filler_lines(diff_T *dp, int idx, linenr_T lnum, int *linestatus) |
| 2148 | { |
| 2149 | int filler_lines_d1 = 0; |
| 2150 | |
| 2151 | while (dp && dp->df_next && |
| 2152 | lnum == (dp->df_lnum[idx] + dp->df_count[idx]) && |
| 2153 | dp->df_next->df_lnum[idx] == lnum) |
| 2154 | { |
| 2155 | if (dp->df_count[idx] == 0) |
| 2156 | filler_lines_d1 += get_max_diff_length(dp); |
| 2157 | dp = dp->df_next; |
| 2158 | } |
| 2159 | |
| 2160 | if (dp->df_count[idx] == 0) |
| 2161 | filler_lines_d1 += get_max_diff_length(dp); |
| 2162 | |
| 2163 | if (lnum < dp->df_lnum[idx] + dp->df_count[idx]) |
| 2164 | { |
| 2165 | int j = 0; |
| 2166 | |
| 2167 | for (int i = 0; i < DB_COUNT; i++) |
| 2168 | { |
| 2169 | if (curtab->tp_diffbuf[i] != NULL) |
| 2170 | { |
| 2171 | if (dp->df_count[i]) |
| 2172 | j++; |
| 2173 | } |
| 2174 | // is this an added line or a changed line? |
| 2175 | if (linestatus) |
| 2176 | (*linestatus) = (j == 1) ? -2 : -1; |
| 2177 | } |
| 2178 | } |
| 2179 | |
| 2180 | return filler_lines_d1; |
| 2181 | } |
| 2182 | |
| 2183 | // Apply results from the linematch algorithm and apply to 'dp' by splitting it |
| 2184 | // into multiple adjacent diff blocks. |
| 2185 | static void |
| 2186 | apply_linematch_results( |
| 2187 | diff_T *dp, |
| 2188 | size_t decisions_length, |
| 2189 | const int *decisions) |
| 2190 | { |
| 2191 | // get the start line number here in each diff buffer, and then increment |
| 2192 | int line_numbers[DB_COUNT]; |
| 2193 | int outputmap[DB_COUNT]; |
| 2194 | size_t ndiffs = 0; |
| 2195 | |
| 2196 | for (int i = 0; i < DB_COUNT; i++) |
| 2197 | { |
| 2198 | if (curtab->tp_diffbuf[i] != NULL) |
| 2199 | { |
| 2200 | line_numbers[i] = dp->df_lnum[i]; |
| 2201 | dp->df_count[i] = 0; |
| 2202 | |
| 2203 | // Keep track of the index of the diff buffer we are using here. |
| 2204 | // We will use this to write the output of the algorithm to |
| 2205 | // diff_T structs at the correct indexes |
| 2206 | outputmap[ndiffs] = i; |
| 2207 | ndiffs++; |
| 2208 | } |
| 2209 | } |
| 2210 | |
| 2211 | // write the diffs starting with the current diff block |
| 2212 | diff_T *dp_s = dp; |
| 2213 | for (size_t i = 0; i < decisions_length; i++) |
| 2214 | { |
| 2215 | // Don't allocate on first iter since we can reuse the initial |
| 2216 | // diffblock |
| 2217 | if (i != 0 && (decisions[i - 1] != decisions[i])) |
| 2218 | { |
| 2219 | // create new sub diff blocks to segment the original diff block |
| 2220 | // which we further divided by running the linematch algorithm |
| 2221 | dp_s = diff_alloc_new(curtab, dp_s, dp_s->df_next); |
| 2222 | dp_s->is_linematched = TRUE; |
| 2223 | for (int j = 0; j < DB_COUNT; j++) |
| 2224 | { |
| 2225 | if (curtab->tp_diffbuf[j] != NULL) |
| 2226 | { |
| 2227 | dp_s->df_lnum[j] = line_numbers[j]; |
| 2228 | dp_s->df_count[j] = 0; |
| 2229 | } |
| 2230 | } |
| 2231 | } |
| 2232 | for (size_t j = 0; j < ndiffs; j++) |
| 2233 | { |
| 2234 | if (decisions[i] & (1 << j)) |
| 2235 | { |
| 2236 | // will need to use the map here |
| 2237 | dp_s->df_count[outputmap[j]]++; |
| 2238 | line_numbers[outputmap[j]]++; |
| 2239 | } |
| 2240 | } |
| 2241 | } |
| 2242 | dp->is_linematched = TRUE; |
| 2243 | } |
| 2244 | |
| 2245 | static void |
| 2246 | run_linematch_algorithm(diff_T *dp) |
| 2247 | { |
| 2248 | // define buffers for diff algorithm |
| 2249 | diffin_T diffbufs_mm[DB_COUNT]; |
| 2250 | const mmfile_t *diffbufs[DB_COUNT]; |
| 2251 | int diff_length[DB_COUNT]; |
| 2252 | size_t ndiffs = 0; |
| 2253 | |
| 2254 | for (int i = 0; i < DB_COUNT; i++) |
| 2255 | { |
| 2256 | if (curtab->tp_diffbuf[i] != NULL) |
| 2257 | { |
| 2258 | // write the contents of the entire buffer to |
| 2259 | // diffbufs_mm[diffbuffers_count] |
| 2260 | if (dp->df_count[i] > 0) |
| 2261 | { |
| 2262 | diff_write_buffer(curtab->tp_diffbuf[i], &diffbufs_mm[ndiffs], |
| 2263 | dp->df_lnum[i], dp->df_lnum[i] + dp->df_count[i] - 1); |
| 2264 | } |
| 2265 | else |
| 2266 | { |
| 2267 | diffbufs_mm[ndiffs].din_mmfile.size = 0; |
| 2268 | diffbufs_mm[ndiffs].din_mmfile.ptr = NULL; |
| 2269 | } |
| 2270 | |
| 2271 | diffbufs[ndiffs] = &diffbufs_mm[ndiffs].din_mmfile; |
| 2272 | |
| 2273 | // keep track of the length of this diff block to pass it to the |
| 2274 | // linematch algorithm |
| 2275 | diff_length[ndiffs] = dp->df_count[i]; |
| 2276 | |
| 2277 | // increment the amount of diff buffers we are passing to the |
| 2278 | // algorithm |
| 2279 | ndiffs++; |
| 2280 | } |
| 2281 | } |
| 2282 | |
| 2283 | // we will get the output of the linematch algorithm in the format of an |
| 2284 | // array of integers (*decisions) and the length of that array |
| 2285 | // (decisions_length) |
| 2286 | int *decisions = NULL; |
| 2287 | const int iwhite = (diff_flags & (DIFF_IWHITEALL | DIFF_IWHITE)) > 0 ? 1 : 0; |
| 2288 | size_t decisions_length = |
| 2289 | linematch_nbuffers(diffbufs, diff_length, ndiffs, &decisions, iwhite); |
| 2290 | |
| 2291 | for (size_t i = 0; i < ndiffs; i++) |
| 2292 | free(diffbufs_mm[i].din_mmfile.ptr); // TODO should this be vim_free ? |
| 2293 | |
| 2294 | apply_linematch_results(dp, decisions_length, decisions); |
| 2295 | |
| 2296 | free(decisions); |
| 2297 | } |
| 2298 | |
| 2299 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2300 | * Check diff status for line "lnum" in buffer "buf": |
| 2301 | * Returns 0 for nothing special |
| 2302 | * Returns -1 for a line that should be highlighted as changed. |
| 2303 | * Returns -2 for a line that should be highlighted as added/deleted. |
| 2304 | * Returns > 0 for inserting that many filler lines above it (never happens |
| 2305 | * when 'diffopt' doesn't contain "filler"). |
| 2306 | * This should only be used for windows where 'diff' is set. |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2307 | * When diffopt contains linematch, a changed/added/deleted line |
| 2308 | * may also have filler lines above it. In such a case, the possibilities |
| 2309 | * are no longer mutually exclusive. The number of filler lines is |
| 2310 | * returned from diff_check, and the integer 'linestatus' passed by |
| 2311 | * pointer is set to -1 to indicate a changed line, and -2 to indicate an |
| 2312 | * added line |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2313 | */ |
| 2314 | int |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2315 | diff_check_with_linestatus(win_T *wp, linenr_T lnum, int *linestatus) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2316 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2317 | int idx; // index in tp_diffbuf[] for this buffer |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2318 | diff_T *dp; |
| 2319 | int maxcount; |
| 2320 | int i; |
| 2321 | buf_T *buf = wp->w_buffer; |
| 2322 | int cmp; |
| 2323 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2324 | if (curtab->tp_diff_invalid) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2325 | ex_diffupdate(NULL); // update after a big change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2326 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2327 | if (curtab->tp_first_diff == NULL || !wp->w_p_diff) // no diffs at all |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2328 | return 0; |
| 2329 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2330 | // safety check: "lnum" must be a buffer line |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2331 | if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1) |
| 2332 | return 0; |
| 2333 | |
| 2334 | idx = diff_buf_idx(buf); |
| 2335 | if (idx == DB_COUNT) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2336 | return 0; // no diffs for buffer "buf" |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2337 | |
| 2338 | #ifdef FEAT_FOLDING |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2339 | // A closed fold never has filler lines. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2340 | if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL)) |
| 2341 | return 0; |
| 2342 | #endif |
| 2343 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2344 | // search for a change that includes "lnum" in the list of diffblocks. |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 2345 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2346 | if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
| 2347 | break; |
| 2348 | if (dp == NULL || lnum < dp->df_lnum[idx]) |
| 2349 | return 0; |
| 2350 | |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2351 | // Don't run linematch when lnum is offscreen. Useful for scrollbind |
| 2352 | // calculations which need to count all the filler lines above the screen. |
| 2353 | if (lnum >= wp->w_topline && lnum < wp->w_botline |
Jonathon | ca307ef | 2025-01-17 13:37:35 +0100 | [diff] [blame] | 2354 | && !dp->is_linematched && diff_linematch(dp) |
| 2355 | && diff_check_sanity(curtab, dp)) |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2356 | run_linematch_algorithm(dp); |
| 2357 | |
| 2358 | if (dp->is_linematched) |
| 2359 | return linematched_filler_lines(dp, idx, lnum, linestatus); |
| 2360 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2361 | if (lnum < dp->df_lnum[idx] + dp->df_count[idx]) |
| 2362 | { |
| 2363 | int zero = FALSE; |
| 2364 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2365 | // Changed or inserted line. If the other buffers have a count of |
| 2366 | // zero, the lines were inserted. If the other buffers have the same |
| 2367 | // count, check if the lines are identical. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2368 | cmp = FALSE; |
| 2369 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2370 | if (i != idx && curtab->tp_diffbuf[i] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2371 | { |
| 2372 | if (dp->df_count[i] == 0) |
| 2373 | zero = TRUE; |
| 2374 | else |
| 2375 | { |
| 2376 | if (dp->df_count[i] != dp->df_count[idx]) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2377 | return -1; // nr of lines changed. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2378 | cmp = TRUE; |
| 2379 | } |
| 2380 | } |
| 2381 | if (cmp) |
| 2382 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2383 | // Compare all lines. If they are equal the lines were inserted |
| 2384 | // in some buffers, deleted in others, but not changed. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2385 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 7c0a2f3 | 2016-07-10 22:11:16 +0200 | [diff] [blame] | 2386 | if (i != idx && curtab->tp_diffbuf[i] != NULL |
| 2387 | && dp->df_count[i] != 0) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2388 | if (!diff_equal_entry(dp, idx, i)) |
| 2389 | return -1; |
| 2390 | } |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2391 | // If there is no buffer with zero lines then there is no difference |
| 2392 | // any longer. Happens when making a change (or undo) that removes |
| 2393 | // the difference. Can't remove the entry here, we might be halfway |
| 2394 | // updating the window. Just report the text as unchanged. Other |
| 2395 | // windows might still show the change though. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2396 | if (zero == FALSE) |
| 2397 | return 0; |
| 2398 | return -2; |
| 2399 | } |
| 2400 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2401 | // If 'diffopt' doesn't contain "filler", return 0. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2402 | if (!(diff_flags & DIFF_FILLER)) |
| 2403 | return 0; |
| 2404 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2405 | // Insert filler lines above the line just below the change. Will return |
| 2406 | // 0 when this buf had the max count. |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2407 | maxcount = get_max_diff_length(dp); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2408 | return maxcount - dp->df_count[idx]; |
| 2409 | } |
| 2410 | |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2411 | int |
| 2412 | diff_check(win_T *wp, linenr_T lnum) |
| 2413 | { |
| 2414 | return diff_check_with_linestatus(wp, lnum, NULL); |
| 2415 | } |
| 2416 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2417 | /* |
| 2418 | * Compare two entries in diff "*dp" and return TRUE if they are equal. |
| 2419 | */ |
| 2420 | static int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2421 | diff_equal_entry(diff_T *dp, int idx1, int idx2) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2422 | { |
| 2423 | int i; |
| 2424 | char_u *line; |
| 2425 | int cmp; |
| 2426 | |
| 2427 | if (dp->df_count[idx1] != dp->df_count[idx2]) |
| 2428 | return FALSE; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2429 | if (diff_check_sanity(curtab, dp) == FAIL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2430 | return FALSE; |
| 2431 | for (i = 0; i < dp->df_count[idx1]; ++i) |
| 2432 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2433 | line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1], |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2434 | dp->df_lnum[idx1] + i, FALSE)); |
| 2435 | if (line == NULL) |
| 2436 | return FALSE; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2437 | cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2], |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2438 | dp->df_lnum[idx2] + i, FALSE)); |
| 2439 | vim_free(line); |
| 2440 | if (cmp != 0) |
| 2441 | return FALSE; |
| 2442 | } |
| 2443 | return TRUE; |
| 2444 | } |
| 2445 | |
| 2446 | /* |
Bram Moolenaar | ae96b8d | 2017-09-03 15:04:21 +0200 | [diff] [blame] | 2447 | * Compare the characters at "p1" and "p2". If they are equal (possibly |
| 2448 | * ignoring case) return TRUE and set "len" to the number of bytes. |
| 2449 | */ |
| 2450 | static int |
| 2451 | diff_equal_char(char_u *p1, char_u *p2, int *len) |
| 2452 | { |
Bram Moolenaar | ae96b8d | 2017-09-03 15:04:21 +0200 | [diff] [blame] | 2453 | int l = (*mb_ptr2len)(p1); |
| 2454 | |
| 2455 | if (l != (*mb_ptr2len)(p2)) |
| 2456 | return FALSE; |
| 2457 | if (l > 1) |
| 2458 | { |
| 2459 | if (STRNCMP(p1, p2, l) != 0 |
| 2460 | && (!enc_utf8 |
| 2461 | || !(diff_flags & DIFF_ICASE) |
| 2462 | || utf_fold(utf_ptr2char(p1)) |
| 2463 | != utf_fold(utf_ptr2char(p2)))) |
| 2464 | return FALSE; |
| 2465 | *len = l; |
| 2466 | } |
| 2467 | else |
Bram Moolenaar | ae96b8d | 2017-09-03 15:04:21 +0200 | [diff] [blame] | 2468 | { |
| 2469 | if ((*p1 != *p2) |
| 2470 | && (!(diff_flags & DIFF_ICASE) |
| 2471 | || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2))) |
| 2472 | return FALSE; |
| 2473 | *len = 1; |
| 2474 | } |
| 2475 | return TRUE; |
| 2476 | } |
| 2477 | |
| 2478 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2479 | * Compare strings "s1" and "s2" according to 'diffopt'. |
| 2480 | * Return non-zero when they are different. |
| 2481 | */ |
| 2482 | static int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2483 | diff_cmp(char_u *s1, char_u *s2) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2484 | { |
| 2485 | char_u *p1, *p2; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2486 | int l; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2487 | |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2488 | if ((diff_flags & DIFF_IBLANK) |
| 2489 | && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL)) |
| 2490 | return 0; |
| 2491 | |
| 2492 | if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2493 | return STRCMP(s1, s2); |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2494 | if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2495 | return MB_STRICMP(s1, s2); |
| 2496 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2497 | p1 = s1; |
| 2498 | p2 = s2; |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2499 | |
| 2500 | // Ignore white space changes and possibly ignore case. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2501 | while (*p1 != NUL && *p2 != NUL) |
| 2502 | { |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2503 | if (((diff_flags & DIFF_IWHITE) |
| 2504 | && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2)) |
| 2505 | || ((diff_flags & DIFF_IWHITEALL) |
| 2506 | && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2)))) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2507 | { |
| 2508 | p1 = skipwhite(p1); |
| 2509 | p2 = skipwhite(p2); |
| 2510 | } |
| 2511 | else |
| 2512 | { |
Bram Moolenaar | ae96b8d | 2017-09-03 15:04:21 +0200 | [diff] [blame] | 2513 | if (!diff_equal_char(p1, p2, &l)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2514 | break; |
Bram Moolenaar | ae96b8d | 2017-09-03 15:04:21 +0200 | [diff] [blame] | 2515 | p1 += l; |
| 2516 | p2 += l; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2517 | } |
| 2518 | } |
| 2519 | |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2520 | // Ignore trailing white space. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2521 | p1 = skipwhite(p1); |
| 2522 | p2 = skipwhite(p2); |
| 2523 | if (*p1 != NUL || *p2 != NUL) |
| 2524 | return 1; |
| 2525 | return 0; |
| 2526 | } |
| 2527 | |
| 2528 | /* |
| 2529 | * Return the number of filler lines above "lnum". |
| 2530 | */ |
| 2531 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2532 | diff_check_fill(win_T *wp, linenr_T lnum) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2533 | { |
| 2534 | int n; |
| 2535 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2536 | // be quick when there are no filler lines |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2537 | if (!(diff_flags & DIFF_FILLER)) |
| 2538 | return 0; |
| 2539 | n = diff_check(wp, lnum); |
| 2540 | if (n <= 0) |
| 2541 | return 0; |
| 2542 | return n; |
| 2543 | } |
| 2544 | |
| 2545 | /* |
| 2546 | * Set the topline of "towin" to match the position in "fromwin", so that they |
| 2547 | * show the same diff'ed lines. |
| 2548 | */ |
| 2549 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2550 | diff_set_topline(win_T *fromwin, win_T *towin) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2551 | { |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2552 | buf_T *frombuf = fromwin->w_buffer; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2553 | linenr_T lnum = fromwin->w_topline; |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2554 | int fromidx; |
| 2555 | int toidx; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2556 | diff_T *dp; |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2557 | int max_count; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2558 | int i; |
| 2559 | |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2560 | fromidx = diff_buf_idx(frombuf); |
| 2561 | if (fromidx == DB_COUNT) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2562 | return; // safety check |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2563 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2564 | if (curtab->tp_diff_invalid) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2565 | ex_diffupdate(NULL); // update after a big change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2566 | |
| 2567 | towin->w_topfill = 0; |
| 2568 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2569 | // search for a change that includes "lnum" in the list of diffblocks. |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 2570 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2571 | if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2572 | break; |
| 2573 | if (dp == NULL) |
| 2574 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2575 | // After last change, compute topline relative to end of file; no |
| 2576 | // filler lines. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2577 | towin->w_topline = towin->w_buffer->b_ml.ml_line_count |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2578 | - (frombuf->b_ml.ml_line_count - lnum); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2579 | } |
| 2580 | else |
| 2581 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2582 | // Find index for "towin". |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2583 | toidx = diff_buf_idx(towin->w_buffer); |
| 2584 | if (toidx == DB_COUNT) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2585 | return; // safety check |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2586 | |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2587 | towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]); |
| 2588 | if (lnum >= dp->df_lnum[fromidx]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2589 | { |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2590 | if (dp->is_linematched) |
| 2591 | { |
| 2592 | calculate_topfill_and_topline(fromidx, toidx, |
| 2593 | fromwin->w_topline, |
| 2594 | fromwin->w_topfill, |
| 2595 | &towin->w_topfill, |
| 2596 | &towin->w_topline); |
| 2597 | } |
| 2598 | else |
| 2599 | { |
| 2600 | // Inside a change: compute filler lines. With three or more |
| 2601 | // buffers we need to know the largest count. |
| 2602 | max_count = 0; |
| 2603 | for (i = 0; i < DB_COUNT; ++i) |
| 2604 | if (curtab->tp_diffbuf[i] != NULL |
| 2605 | && max_count < dp->df_count[i]) |
| 2606 | max_count = dp->df_count[i]; |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2607 | |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2608 | if (dp->df_count[toidx] == dp->df_count[fromidx]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2609 | { |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2610 | // same number of lines: use same filler count |
| 2611 | towin->w_topfill = fromwin->w_topfill; |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2612 | } |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2613 | else if (dp->df_count[toidx] > dp->df_count[fromidx]) |
Bram Moolenaar | bb8f88b | 2008-01-18 16:40:00 +0000 | [diff] [blame] | 2614 | { |
| 2615 | if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2616 | { |
| 2617 | // more lines in towin and fromwin doesn't show diff |
| 2618 | // lines, only filler lines |
| 2619 | if (max_count - fromwin->w_topfill >= dp->df_count[toidx]) |
| 2620 | { |
| 2621 | // towin also only shows filler lines |
| 2622 | towin->w_topline = dp->df_lnum[toidx] |
| 2623 | + dp->df_count[toidx]; |
| 2624 | towin->w_topfill = fromwin->w_topfill; |
| 2625 | } |
| 2626 | else |
| 2627 | // towin still has some diff lines to show |
| 2628 | towin->w_topline = dp->df_lnum[toidx] |
| 2629 | + max_count - fromwin->w_topfill; |
| 2630 | } |
| 2631 | } |
| 2632 | else if (towin->w_topline >= dp->df_lnum[toidx] |
| 2633 | + dp->df_count[toidx]) |
| 2634 | { |
| 2635 | // less lines in towin and no diff lines to show: compute |
| 2636 | // filler lines |
| 2637 | towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx]; |
| 2638 | if (diff_flags & DIFF_FILLER) |
| 2639 | { |
| 2640 | if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) |
| 2641 | // fromwin is also out of diff lines |
| 2642 | towin->w_topfill = fromwin->w_topfill; |
| 2643 | else |
| 2644 | // fromwin has some diff lines |
| 2645 | towin->w_topfill = dp->df_lnum[fromidx] + |
| 2646 | max_count - lnum; |
| 2647 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2648 | } |
| 2649 | } |
| 2650 | } |
| 2651 | } |
| 2652 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2653 | // safety check (if diff info gets outdated strange things may happen) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2654 | towin->w_botfill = FALSE; |
| 2655 | if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count) |
| 2656 | { |
| 2657 | towin->w_topline = towin->w_buffer->b_ml.ml_line_count; |
| 2658 | towin->w_botfill = TRUE; |
| 2659 | } |
| 2660 | if (towin->w_topline < 1) |
| 2661 | { |
| 2662 | towin->w_topline = 1; |
| 2663 | towin->w_topfill = 0; |
| 2664 | } |
| 2665 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2666 | // When w_topline changes need to recompute w_botline and cursor position |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2667 | invalidate_botline_win(towin); |
| 2668 | changed_line_abv_curs_win(towin); |
| 2669 | |
| 2670 | check_topfill(towin, FALSE); |
| 2671 | #ifdef FEAT_FOLDING |
| 2672 | (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline, |
| 2673 | NULL, TRUE, NULL); |
| 2674 | #endif |
| 2675 | } |
| 2676 | |
| 2677 | /* |
| 2678 | * This is called when 'diffopt' is changed. |
| 2679 | */ |
| 2680 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2681 | diffopt_changed(void) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2682 | { |
| 2683 | char_u *p; |
| 2684 | int diff_context_new = 6; |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2685 | int linematch_lines_new = 0; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2686 | int diff_flags_new = 0; |
Bram Moolenaar | c4675a1 | 2006-03-15 22:50:30 +0000 | [diff] [blame] | 2687 | int diff_foldcolumn_new = 2; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2688 | long diff_algorithm_new = 0; |
Bram Moolenaar | b6fc728 | 2018-12-04 22:24:16 +0100 | [diff] [blame] | 2689 | long diff_indent_heuristic = 0; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2690 | tabpage_T *tp; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2691 | |
| 2692 | p = p_dip; |
| 2693 | while (*p != NUL) |
| 2694 | { |
Yee Cheng Chin | 900894b | 2023-09-29 20:42:32 +0200 | [diff] [blame] | 2695 | // Note: Keep this in sync with p_dip_values |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2696 | if (STRNCMP(p, "filler", 6) == 0) |
| 2697 | { |
| 2698 | p += 6; |
| 2699 | diff_flags_new |= DIFF_FILLER; |
| 2700 | } |
| 2701 | else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8])) |
| 2702 | { |
| 2703 | p += 8; |
| 2704 | diff_context_new = getdigits(&p); |
| 2705 | } |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2706 | else if (STRNCMP(p, "iblank", 6) == 0) |
| 2707 | { |
| 2708 | p += 6; |
| 2709 | diff_flags_new |= DIFF_IBLANK; |
| 2710 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2711 | else if (STRNCMP(p, "icase", 5) == 0) |
| 2712 | { |
| 2713 | p += 5; |
| 2714 | diff_flags_new |= DIFF_ICASE; |
| 2715 | } |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2716 | else if (STRNCMP(p, "iwhiteall", 9) == 0) |
| 2717 | { |
| 2718 | p += 9; |
| 2719 | diff_flags_new |= DIFF_IWHITEALL; |
| 2720 | } |
| 2721 | else if (STRNCMP(p, "iwhiteeol", 9) == 0) |
| 2722 | { |
| 2723 | p += 9; |
| 2724 | diff_flags_new |= DIFF_IWHITEEOL; |
| 2725 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2726 | else if (STRNCMP(p, "iwhite", 6) == 0) |
| 2727 | { |
| 2728 | p += 6; |
| 2729 | diff_flags_new |= DIFF_IWHITE; |
| 2730 | } |
Bram Moolenaar | c4675a1 | 2006-03-15 22:50:30 +0000 | [diff] [blame] | 2731 | else if (STRNCMP(p, "horizontal", 10) == 0) |
| 2732 | { |
| 2733 | p += 10; |
| 2734 | diff_flags_new |= DIFF_HORIZONTAL; |
| 2735 | } |
| 2736 | else if (STRNCMP(p, "vertical", 8) == 0) |
| 2737 | { |
| 2738 | p += 8; |
| 2739 | diff_flags_new |= DIFF_VERTICAL; |
| 2740 | } |
| 2741 | else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11])) |
| 2742 | { |
| 2743 | p += 11; |
| 2744 | diff_foldcolumn_new = getdigits(&p); |
| 2745 | } |
Bram Moolenaar | 97ce419 | 2017-12-01 20:35:58 +0100 | [diff] [blame] | 2746 | else if (STRNCMP(p, "hiddenoff", 9) == 0) |
| 2747 | { |
| 2748 | p += 9; |
| 2749 | diff_flags_new |= DIFF_HIDDEN_OFF; |
| 2750 | } |
Bram Moolenaar | c823477 | 2019-11-10 21:00:27 +0100 | [diff] [blame] | 2751 | else if (STRNCMP(p, "closeoff", 8) == 0) |
| 2752 | { |
| 2753 | p += 8; |
| 2754 | diff_flags_new |= DIFF_CLOSE_OFF; |
| 2755 | } |
Bram Moolenaar | 4223d43 | 2021-02-10 13:18:17 +0100 | [diff] [blame] | 2756 | else if (STRNCMP(p, "followwrap", 10) == 0) |
| 2757 | { |
| 2758 | p += 10; |
| 2759 | diff_flags_new |= DIFF_FOLLOWWRAP; |
| 2760 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2761 | else if (STRNCMP(p, "indent-heuristic", 16) == 0) |
| 2762 | { |
| 2763 | p += 16; |
Bram Moolenaar | b6fc728 | 2018-12-04 22:24:16 +0100 | [diff] [blame] | 2764 | diff_indent_heuristic = XDF_INDENT_HEURISTIC; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2765 | } |
| 2766 | else if (STRNCMP(p, "internal", 8) == 0) |
| 2767 | { |
| 2768 | p += 8; |
| 2769 | diff_flags_new |= DIFF_INTERNAL; |
| 2770 | } |
| 2771 | else if (STRNCMP(p, "algorithm:", 10) == 0) |
| 2772 | { |
Yee Cheng Chin | 900894b | 2023-09-29 20:42:32 +0200 | [diff] [blame] | 2773 | // Note: Keep this in sync with p_dip_algorithm_values. |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2774 | p += 10; |
| 2775 | if (STRNCMP(p, "myers", 5) == 0) |
| 2776 | { |
| 2777 | p += 5; |
| 2778 | diff_algorithm_new = 0; |
| 2779 | } |
| 2780 | else if (STRNCMP(p, "minimal", 7) == 0) |
| 2781 | { |
| 2782 | p += 7; |
| 2783 | diff_algorithm_new = XDF_NEED_MINIMAL; |
| 2784 | } |
| 2785 | else if (STRNCMP(p, "patience", 8) == 0) |
| 2786 | { |
| 2787 | p += 8; |
| 2788 | diff_algorithm_new = XDF_PATIENCE_DIFF; |
| 2789 | } |
| 2790 | else if (STRNCMP(p, "histogram", 9) == 0) |
| 2791 | { |
| 2792 | p += 9; |
| 2793 | diff_algorithm_new = XDF_HISTOGRAM_DIFF; |
| 2794 | } |
Bram Moolenaar | d072105 | 2018-11-05 21:21:33 +0100 | [diff] [blame] | 2795 | else |
| 2796 | return FAIL; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2797 | } |
zeertzjq | ccd7f45 | 2025-02-03 18:49:49 +0100 | [diff] [blame] | 2798 | else if (STRNCMP(p, "linematch:", 10) == 0 && VIM_ISDIGIT(p[10])) |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2799 | { |
| 2800 | p += 10; |
| 2801 | linematch_lines_new = getdigits(&p); |
| 2802 | diff_flags_new |= DIFF_LINEMATCH; |
| 2803 | } |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2804 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2805 | if (*p != ',' && *p != NUL) |
| 2806 | return FAIL; |
| 2807 | if (*p == ',') |
| 2808 | ++p; |
| 2809 | } |
| 2810 | |
Bram Moolenaar | b6fc728 | 2018-12-04 22:24:16 +0100 | [diff] [blame] | 2811 | diff_algorithm_new |= diff_indent_heuristic; |
| 2812 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2813 | // Can't have both "horizontal" and "vertical". |
Bram Moolenaar | c4675a1 | 2006-03-15 22:50:30 +0000 | [diff] [blame] | 2814 | if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL)) |
| 2815 | return FAIL; |
| 2816 | |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 2817 | // If flags were added or removed, or the algorithm was changed, need to |
| 2818 | // update the diff. |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2819 | if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new) |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 2820 | FOR_ALL_TABPAGES(tp) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2821 | tp->tp_diff_invalid = TRUE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2822 | |
| 2823 | diff_flags = diff_flags_new; |
Bram Moolenaar | b9ddda6 | 2019-02-19 23:00:50 +0100 | [diff] [blame] | 2824 | diff_context = diff_context_new == 0 ? 1 : diff_context_new; |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2825 | linematch_lines = linematch_lines_new; |
Bram Moolenaar | c4675a1 | 2006-03-15 22:50:30 +0000 | [diff] [blame] | 2826 | diff_foldcolumn = diff_foldcolumn_new; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 2827 | diff_algorithm = diff_algorithm_new; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2828 | |
| 2829 | diff_redraw(TRUE); |
| 2830 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2831 | // recompute the scroll binding with the new option value, may |
| 2832 | // remove or add filler lines |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2833 | check_scrollbind((linenr_T)0, 0L); |
| 2834 | |
| 2835 | return OK; |
| 2836 | } |
| 2837 | |
| 2838 | /* |
Bram Moolenaar | c4675a1 | 2006-03-15 22:50:30 +0000 | [diff] [blame] | 2839 | * Return TRUE if 'diffopt' contains "horizontal". |
| 2840 | */ |
| 2841 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2842 | diffopt_horizontal(void) |
Bram Moolenaar | c4675a1 | 2006-03-15 22:50:30 +0000 | [diff] [blame] | 2843 | { |
| 2844 | return (diff_flags & DIFF_HORIZONTAL) != 0; |
| 2845 | } |
| 2846 | |
| 2847 | /* |
Bram Moolenaar | 97ce419 | 2017-12-01 20:35:58 +0100 | [diff] [blame] | 2848 | * Return TRUE if 'diffopt' contains "hiddenoff". |
| 2849 | */ |
| 2850 | int |
| 2851 | diffopt_hiddenoff(void) |
| 2852 | { |
| 2853 | return (diff_flags & DIFF_HIDDEN_OFF) != 0; |
| 2854 | } |
| 2855 | |
| 2856 | /* |
Bram Moolenaar | c823477 | 2019-11-10 21:00:27 +0100 | [diff] [blame] | 2857 | * Return TRUE if 'diffopt' contains "closeoff". |
| 2858 | */ |
| 2859 | int |
| 2860 | diffopt_closeoff(void) |
| 2861 | { |
| 2862 | return (diff_flags & DIFF_CLOSE_OFF) != 0; |
| 2863 | } |
| 2864 | |
| 2865 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2866 | * Find the difference within a changed line. |
| 2867 | * Returns TRUE if the line was added, no other buffer has it. |
| 2868 | */ |
| 2869 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 2870 | diff_find_change( |
| 2871 | win_T *wp, |
| 2872 | linenr_T lnum, |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2873 | int *startp, // first char of the change |
| 2874 | int *endp) // last char of the change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2875 | { |
| 2876 | char_u *line_org; |
| 2877 | char_u *line_new; |
| 2878 | int i; |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2879 | int si_org, si_new; |
| 2880 | int ei_org, ei_new; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2881 | diff_T *dp; |
| 2882 | int idx; |
| 2883 | int off; |
| 2884 | int added = TRUE; |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2885 | char_u *p1, *p2; |
| 2886 | int l; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2887 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2888 | // Make a copy of the line, the next ml_get() will invalidate it. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2889 | line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE)); |
| 2890 | if (line_org == NULL) |
| 2891 | return FALSE; |
| 2892 | |
| 2893 | idx = diff_buf_idx(wp->w_buffer); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2894 | if (idx == DB_COUNT) // cannot happen |
Bram Moolenaar | fa3491a | 2007-02-20 02:49:19 +0000 | [diff] [blame] | 2895 | { |
| 2896 | vim_free(line_org); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2897 | return FALSE; |
Bram Moolenaar | fa3491a | 2007-02-20 02:49:19 +0000 | [diff] [blame] | 2898 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2899 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2900 | // search for a change that includes "lnum" in the list of diffblocks. |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 2901 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2902 | if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
| 2903 | break; |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 2904 | if (dp->is_linematched) |
| 2905 | { |
| 2906 | while (dp && dp->df_next |
| 2907 | && lnum == dp->df_count[idx] + dp->df_lnum[idx] |
| 2908 | && dp->df_next->df_lnum[idx] == lnum) |
| 2909 | dp = dp->df_next; |
| 2910 | } |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2911 | if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL) |
Bram Moolenaar | fa3491a | 2007-02-20 02:49:19 +0000 | [diff] [blame] | 2912 | { |
| 2913 | vim_free(line_org); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2914 | return FALSE; |
Bram Moolenaar | fa3491a | 2007-02-20 02:49:19 +0000 | [diff] [blame] | 2915 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2916 | |
| 2917 | off = lnum - dp->df_lnum[idx]; |
| 2918 | |
| 2919 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 2920 | if (curtab->tp_diffbuf[i] != NULL && i != idx) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2921 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2922 | // Skip lines that are not in the other change (filler lines). |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2923 | if (off >= dp->df_count[i]) |
| 2924 | continue; |
| 2925 | added = FALSE; |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2926 | line_new = ml_get_buf(curtab->tp_diffbuf[i], |
| 2927 | dp->df_lnum[i] + off, FALSE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2928 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2929 | // Search for start of difference |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2930 | si_org = si_new = 0; |
| 2931 | while (line_org[si_org] != NUL) |
| 2932 | { |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2933 | if (((diff_flags & DIFF_IWHITE) |
| 2934 | && VIM_ISWHITE(line_org[si_org]) |
| 2935 | && VIM_ISWHITE(line_new[si_new])) |
| 2936 | || ((diff_flags & DIFF_IWHITEALL) |
| 2937 | && (VIM_ISWHITE(line_org[si_org]) |
| 2938 | || VIM_ISWHITE(line_new[si_new])))) |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2939 | { |
Bram Moolenaar | a93fa7e | 2006-04-17 22:14:47 +0000 | [diff] [blame] | 2940 | si_org = (int)(skipwhite(line_org + si_org) - line_org); |
| 2941 | si_new = (int)(skipwhite(line_new + si_new) - line_new); |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2942 | } |
| 2943 | else |
| 2944 | { |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2945 | if (!diff_equal_char(line_org + si_org, line_new + si_new, |
| 2946 | &l)) |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2947 | break; |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2948 | si_org += l; |
| 2949 | si_new += l; |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2950 | } |
| 2951 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2952 | if (has_mbyte) |
| 2953 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2954 | // Move back to first byte of character in both lines (may |
| 2955 | // have "nn^" in line_org and "n^ in line_new). |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2956 | si_org -= (*mb_head_off)(line_org, line_org + si_org); |
| 2957 | si_new -= (*mb_head_off)(line_new, line_new + si_new); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2958 | } |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2959 | if (*startp > si_org) |
| 2960 | *startp = si_org; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2961 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 2962 | // Search for end of difference, if any. |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2963 | if (line_org[si_org] != NUL || line_new[si_new] != NUL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2964 | { |
| 2965 | ei_org = (int)STRLEN(line_org); |
| 2966 | ei_new = (int)STRLEN(line_new); |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2967 | while (ei_org >= *startp && ei_new >= si_new |
| 2968 | && ei_org >= 0 && ei_new >= 0) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2969 | { |
Bram Moolenaar | 785fc65 | 2018-09-15 19:17:38 +0200 | [diff] [blame] | 2970 | if (((diff_flags & DIFF_IWHITE) |
| 2971 | && VIM_ISWHITE(line_org[ei_org]) |
| 2972 | && VIM_ISWHITE(line_new[ei_new])) |
| 2973 | || ((diff_flags & DIFF_IWHITEALL) |
| 2974 | && (VIM_ISWHITE(line_org[ei_org]) |
| 2975 | || VIM_ISWHITE(line_new[ei_new])))) |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2976 | { |
| 2977 | while (ei_org >= *startp |
Bram Moolenaar | 1c46544 | 2017-03-12 20:10:05 +0100 | [diff] [blame] | 2978 | && VIM_ISWHITE(line_org[ei_org])) |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2979 | --ei_org; |
| 2980 | while (ei_new >= si_new |
Bram Moolenaar | 1c46544 | 2017-03-12 20:10:05 +0100 | [diff] [blame] | 2981 | && VIM_ISWHITE(line_new[ei_new])) |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2982 | --ei_new; |
| 2983 | } |
| 2984 | else |
| 2985 | { |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2986 | p1 = line_org + ei_org; |
| 2987 | p2 = line_new + ei_new; |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2988 | p1 -= (*mb_head_off)(line_org, p1); |
| 2989 | p2 -= (*mb_head_off)(line_new, p2); |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2990 | if (!diff_equal_char(p1, p2, &l)) |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2991 | break; |
Bram Moolenaar | da22b8c | 2017-09-02 18:01:50 +0200 | [diff] [blame] | 2992 | ei_org -= l; |
| 2993 | ei_new -= l; |
Bram Moolenaar | 9e54a0e | 2006-04-14 20:42:25 +0000 | [diff] [blame] | 2994 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 2995 | } |
| 2996 | if (*endp < ei_org) |
| 2997 | *endp = ei_org; |
| 2998 | } |
| 2999 | } |
| 3000 | |
| 3001 | vim_free(line_org); |
| 3002 | return added; |
| 3003 | } |
| 3004 | |
| 3005 | #if defined(FEAT_FOLDING) || defined(PROTO) |
| 3006 | /* |
| 3007 | * Return TRUE if line "lnum" is not close to a diff block, this line should |
| 3008 | * be in a fold. |
| 3009 | * Return FALSE if there are no diff blocks at all in this window. |
| 3010 | */ |
| 3011 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3012 | diff_infold(win_T *wp, linenr_T lnum) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3013 | { |
| 3014 | int i; |
| 3015 | int idx = -1; |
| 3016 | int other = FALSE; |
| 3017 | diff_T *dp; |
| 3018 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3019 | // Return if 'diff' isn't set. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3020 | if (!wp->w_p_diff) |
| 3021 | return FALSE; |
| 3022 | |
| 3023 | for (i = 0; i < DB_COUNT; ++i) |
| 3024 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3025 | if (curtab->tp_diffbuf[i] == wp->w_buffer) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3026 | idx = i; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3027 | else if (curtab->tp_diffbuf[i] != NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3028 | other = TRUE; |
| 3029 | } |
| 3030 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3031 | // return here if there are no diffs in the window |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3032 | if (idx == -1 || !other) |
| 3033 | return FALSE; |
| 3034 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3035 | if (curtab->tp_diff_invalid) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3036 | ex_diffupdate(NULL); // update after a big change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3037 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3038 | // Return if there are no diff blocks. All lines will be folded. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3039 | if (curtab->tp_first_diff == NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3040 | return TRUE; |
| 3041 | |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 3042 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3043 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3044 | // If this change is below the line there can't be any further match. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3045 | if (dp->df_lnum[idx] - diff_context > lnum) |
| 3046 | break; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3047 | // If this change ends before the line we have a match. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3048 | if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum) |
| 3049 | return FALSE; |
| 3050 | } |
| 3051 | return TRUE; |
| 3052 | } |
| 3053 | #endif |
| 3054 | |
| 3055 | /* |
| 3056 | * "dp" and "do" commands. |
| 3057 | */ |
| 3058 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3059 | nv_diffgetput(int put, long count) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3060 | { |
| 3061 | exarg_T ea; |
Bram Moolenaar | 6a64365 | 2014-10-31 13:54:25 +0100 | [diff] [blame] | 3062 | char_u buf[30]; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3063 | |
Bram Moolenaar | f273245 | 2018-06-03 14:47:35 +0200 | [diff] [blame] | 3064 | #ifdef FEAT_JOB_CHANNEL |
| 3065 | if (bt_prompt(curbuf)) |
| 3066 | { |
| 3067 | vim_beep(BO_OPER); |
| 3068 | return; |
| 3069 | } |
| 3070 | #endif |
Bram Moolenaar | 6a64365 | 2014-10-31 13:54:25 +0100 | [diff] [blame] | 3071 | if (count == 0) |
| 3072 | ea.arg = (char_u *)""; |
| 3073 | else |
| 3074 | { |
| 3075 | vim_snprintf((char *)buf, 30, "%ld", count); |
| 3076 | ea.arg = buf; |
| 3077 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3078 | if (put) |
| 3079 | ea.cmdidx = CMD_diffput; |
| 3080 | else |
| 3081 | ea.cmdidx = CMD_diffget; |
| 3082 | ea.addr_count = 0; |
| 3083 | ea.line1 = curwin->w_cursor.lnum; |
| 3084 | ea.line2 = curwin->w_cursor.lnum; |
| 3085 | ex_diffgetput(&ea); |
| 3086 | } |
| 3087 | |
| 3088 | /* |
Bram Moolenaar | c5274dd | 2022-07-02 15:10:00 +0100 | [diff] [blame] | 3089 | * Return TRUE if "diff" appears in the list of diff blocks of the current tab. |
| 3090 | */ |
| 3091 | static int |
| 3092 | valid_diff(diff_T *diff) |
| 3093 | { |
| 3094 | diff_T *dp; |
| 3095 | |
Yegappan Lakshmanan | 14113fd | 2023-03-07 17:13:51 +0000 | [diff] [blame] | 3096 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | c5274dd | 2022-07-02 15:10:00 +0100 | [diff] [blame] | 3097 | if (dp == diff) |
| 3098 | return TRUE; |
| 3099 | return FALSE; |
| 3100 | } |
| 3101 | |
| 3102 | /* |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3103 | * ":diffget" |
| 3104 | * ":diffput" |
| 3105 | */ |
| 3106 | void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3107 | ex_diffgetput(exarg_T *eap) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3108 | { |
| 3109 | linenr_T lnum; |
| 3110 | int count; |
| 3111 | linenr_T off = 0; |
| 3112 | diff_T *dp; |
| 3113 | diff_T *dprev; |
| 3114 | diff_T *dfree; |
| 3115 | int idx_cur; |
| 3116 | int idx_other; |
| 3117 | int idx_from; |
| 3118 | int idx_to; |
| 3119 | int i; |
| 3120 | int added; |
| 3121 | char_u *p; |
| 3122 | aco_save_T aco; |
| 3123 | buf_T *buf; |
| 3124 | int start_skip, end_skip; |
| 3125 | int new_count; |
Bram Moolenaar | 280f126 | 2006-01-30 00:14:18 +0000 | [diff] [blame] | 3126 | int buf_empty; |
Bram Moolenaar | 602eb74 | 2007-02-20 03:43:38 +0000 | [diff] [blame] | 3127 | int found_not_ma = FALSE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3128 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3129 | // Find the current buffer in the list of diff buffers. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3130 | idx_cur = diff_buf_idx(curbuf); |
| 3131 | if (idx_cur == DB_COUNT) |
| 3132 | { |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 3133 | emsg(_(e_current_buffer_is_not_in_diff_mode)); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3134 | return; |
| 3135 | } |
| 3136 | |
| 3137 | if (*eap->arg == NUL) |
| 3138 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3139 | // No argument: Find the other buffer in the list of diff buffers. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3140 | for (idx_other = 0; idx_other < DB_COUNT; ++idx_other) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3141 | if (curtab->tp_diffbuf[idx_other] != curbuf |
Bram Moolenaar | 602eb74 | 2007-02-20 03:43:38 +0000 | [diff] [blame] | 3142 | && curtab->tp_diffbuf[idx_other] != NULL) |
| 3143 | { |
| 3144 | if (eap->cmdidx != CMD_diffput |
| 3145 | || curtab->tp_diffbuf[idx_other]->b_p_ma) |
| 3146 | break; |
| 3147 | found_not_ma = TRUE; |
| 3148 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3149 | if (idx_other == DB_COUNT) |
| 3150 | { |
Bram Moolenaar | 602eb74 | 2007-02-20 03:43:38 +0000 | [diff] [blame] | 3151 | if (found_not_ma) |
Bram Moolenaar | 677658a | 2022-01-05 16:09:06 +0000 | [diff] [blame] | 3152 | emsg(_(e_no_other_buffer_in_diff_mode_is_modifiable)); |
Bram Moolenaar | 602eb74 | 2007-02-20 03:43:38 +0000 | [diff] [blame] | 3153 | else |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 3154 | emsg(_(e_no_other_buffer_in_diff_mode)); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3155 | return; |
| 3156 | } |
| 3157 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3158 | // Check that there isn't a third buffer in the list |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3159 | for (i = idx_other + 1; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3160 | if (curtab->tp_diffbuf[i] != curbuf |
| 3161 | && curtab->tp_diffbuf[i] != NULL |
| 3162 | && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma)) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3163 | { |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 3164 | emsg(_(e_more_than_two_buffers_in_diff_mode_dont_know_which_one_to_use)); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3165 | return; |
| 3166 | } |
| 3167 | } |
| 3168 | else |
| 3169 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3170 | // Buffer number or pattern given. Ignore trailing white space. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3171 | p = eap->arg + STRLEN(eap->arg); |
Bram Moolenaar | 1c46544 | 2017-03-12 20:10:05 +0100 | [diff] [blame] | 3172 | while (p > eap->arg && VIM_ISWHITE(p[-1])) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3173 | --p; |
| 3174 | for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i) |
| 3175 | ; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3176 | if (eap->arg + i == p) // digits only |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3177 | i = atol((char *)eap->arg); |
| 3178 | else |
| 3179 | { |
Bram Moolenaar | 0c279bb | 2013-03-19 14:25:54 +0100 | [diff] [blame] | 3180 | i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3181 | if (i < 0) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3182 | return; // error message already given |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3183 | } |
| 3184 | buf = buflist_findnr(i); |
| 3185 | if (buf == NULL) |
| 3186 | { |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 3187 | semsg(_(e_cant_find_buffer_str), eap->arg); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3188 | return; |
| 3189 | } |
Bram Moolenaar | 5cc6a6e | 2009-01-22 19:48:55 +0000 | [diff] [blame] | 3190 | if (buf == curbuf) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3191 | return; // nothing to do |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3192 | idx_other = diff_buf_idx(buf); |
| 3193 | if (idx_other == DB_COUNT) |
| 3194 | { |
Bram Moolenaar | e124204 | 2021-12-16 20:56:57 +0000 | [diff] [blame] | 3195 | semsg(_(e_buffer_str_is_not_in_diff_mode), eap->arg); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3196 | return; |
| 3197 | } |
| 3198 | } |
| 3199 | |
| 3200 | diff_busy = TRUE; |
| 3201 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3202 | // When no range given include the line above or below the cursor. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3203 | if (eap->addr_count == 0) |
| 3204 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3205 | // Make it possible that ":diffget" on the last line gets line below |
| 3206 | // the cursor line when there is no difference above the cursor. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3207 | if (eap->cmdidx == CMD_diffget |
| 3208 | && eap->line1 == curbuf->b_ml.ml_line_count |
| 3209 | && diff_check(curwin, eap->line1) == 0 |
| 3210 | && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0)) |
| 3211 | ++eap->line2; |
| 3212 | else if (eap->line1 > 0) |
| 3213 | --eap->line1; |
| 3214 | } |
| 3215 | |
| 3216 | if (eap->cmdidx == CMD_diffget) |
| 3217 | { |
| 3218 | idx_from = idx_other; |
| 3219 | idx_to = idx_cur; |
| 3220 | } |
| 3221 | else |
| 3222 | { |
| 3223 | idx_from = idx_cur; |
| 3224 | idx_to = idx_other; |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3225 | // Need to make the other buffer the current buffer to be able to make |
| 3226 | // changes in it. |
Bram Moolenaar | e76062c | 2022-11-28 18:51:43 +0000 | [diff] [blame] | 3227 | // Set curwin/curbuf to buf and save a few things. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3228 | aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]); |
Bram Moolenaar | e76062c | 2022-11-28 18:51:43 +0000 | [diff] [blame] | 3229 | if (curbuf != curtab->tp_diffbuf[idx_other]) |
| 3230 | // Could not find a window for this buffer, the rest is likely to |
| 3231 | // fail. |
| 3232 | goto theend; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3233 | } |
| 3234 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3235 | // May give the warning for a changed buffer here, which can trigger the |
| 3236 | // FileChangedRO autocommand, which may do nasty things and mess |
| 3237 | // everything up. |
Bram Moolenaar | 910f66f | 2006-04-05 20:41:53 +0000 | [diff] [blame] | 3238 | if (!curbuf->b_changed) |
| 3239 | { |
| 3240 | change_warning(0); |
| 3241 | if (diff_buf_idx(curbuf) != idx_to) |
| 3242 | { |
Bram Moolenaar | 677658a | 2022-01-05 16:09:06 +0000 | [diff] [blame] | 3243 | emsg(_(e_buffer_changed_unexpectedly)); |
Bram Moolenaar | d2b58c0 | 2018-09-16 18:10:48 +0200 | [diff] [blame] | 3244 | goto theend; |
Bram Moolenaar | 910f66f | 2006-04-05 20:41:53 +0000 | [diff] [blame] | 3245 | } |
| 3246 | } |
| 3247 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3248 | dprev = NULL; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3249 | for (dp = curtab->tp_first_diff; dp != NULL; ) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3250 | { |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 3251 | if (!eap->addr_count) |
| 3252 | { |
| 3253 | // handle the case with adjacent diff blocks |
| 3254 | while (dp->is_linematched |
| 3255 | && dp->df_next |
| 3256 | && dp->df_next->df_lnum[idx_cur] == dp->df_lnum[idx_cur] + |
| 3257 | dp->df_count[idx_cur] |
| 3258 | && dp->df_next->df_lnum[idx_cur] == eap->line1 + off + 1) |
| 3259 | { |
| 3260 | dprev = dp; |
| 3261 | dp = dp->df_next; |
| 3262 | } |
| 3263 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3264 | if (dp->df_lnum[idx_cur] > eap->line2 + off) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3265 | break; // past the range that was specified |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3266 | |
| 3267 | dfree = NULL; |
| 3268 | lnum = dp->df_lnum[idx_to]; |
| 3269 | count = dp->df_count[idx_to]; |
| 3270 | if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off |
| 3271 | && u_save(lnum - 1, lnum + count) != FAIL) |
| 3272 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3273 | // Inside the specified range and saving for undo worked. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3274 | start_skip = 0; |
| 3275 | end_skip = 0; |
| 3276 | if (eap->addr_count > 0) |
| 3277 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3278 | // A range was specified: check if lines need to be skipped. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3279 | start_skip = eap->line1 + off - dp->df_lnum[idx_cur]; |
| 3280 | if (start_skip > 0) |
| 3281 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3282 | // range starts below start of current diff block |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3283 | if (start_skip > count) |
| 3284 | { |
| 3285 | lnum += count; |
| 3286 | count = 0; |
| 3287 | } |
| 3288 | else |
| 3289 | { |
| 3290 | count -= start_skip; |
| 3291 | lnum += start_skip; |
| 3292 | } |
| 3293 | } |
| 3294 | else |
| 3295 | start_skip = 0; |
| 3296 | |
| 3297 | end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1 |
| 3298 | - (eap->line2 + off); |
| 3299 | if (end_skip > 0) |
| 3300 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3301 | // range ends above end of current/from diff block |
| 3302 | if (idx_cur == idx_from) // :diffput |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3303 | { |
| 3304 | i = dp->df_count[idx_cur] - start_skip - end_skip; |
| 3305 | if (count > i) |
| 3306 | count = i; |
| 3307 | } |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3308 | else // :diffget |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3309 | { |
| 3310 | count -= end_skip; |
| 3311 | end_skip = dp->df_count[idx_from] - start_skip - count; |
| 3312 | if (end_skip < 0) |
| 3313 | end_skip = 0; |
| 3314 | } |
| 3315 | } |
| 3316 | else |
| 3317 | end_skip = 0; |
| 3318 | } |
| 3319 | |
Bram Moolenaar | b5aedf3 | 2017-03-12 18:23:53 +0100 | [diff] [blame] | 3320 | buf_empty = BUFEMPTY(); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3321 | added = 0; |
| 3322 | for (i = 0; i < count; ++i) |
| 3323 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3324 | // remember deleting the last line of the buffer |
Bram Moolenaar | 280f126 | 2006-01-30 00:14:18 +0000 | [diff] [blame] | 3325 | buf_empty = curbuf->b_ml.ml_line_count == 1; |
Bram Moolenaar | 4e677b9 | 2022-07-28 18:44:27 +0100 | [diff] [blame] | 3326 | if (ml_delete(lnum) == OK) |
| 3327 | --added; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3328 | } |
| 3329 | for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i) |
| 3330 | { |
| 3331 | linenr_T nr; |
| 3332 | |
| 3333 | nr = dp->df_lnum[idx_from] + start_skip + i; |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3334 | if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3335 | break; |
Bram Moolenaar | 910f66f | 2006-04-05 20:41:53 +0000 | [diff] [blame] | 3336 | p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from], |
| 3337 | nr, FALSE)); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3338 | if (p != NULL) |
| 3339 | { |
| 3340 | ml_append(lnum + i - 1, p, 0, FALSE); |
| 3341 | vim_free(p); |
| 3342 | ++added; |
Bram Moolenaar | 280f126 | 2006-01-30 00:14:18 +0000 | [diff] [blame] | 3343 | if (buf_empty && curbuf->b_ml.ml_line_count == 2) |
| 3344 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3345 | // Added the first line into an empty buffer, need to |
| 3346 | // delete the dummy empty line. |
Bram Moolenaar | 280f126 | 2006-01-30 00:14:18 +0000 | [diff] [blame] | 3347 | buf_empty = FALSE; |
Bram Moolenaar | ca70c07 | 2020-05-30 20:30:46 +0200 | [diff] [blame] | 3348 | ml_delete((linenr_T)2); |
Bram Moolenaar | 280f126 | 2006-01-30 00:14:18 +0000 | [diff] [blame] | 3349 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3350 | } |
| 3351 | } |
| 3352 | new_count = dp->df_count[idx_to] + added; |
| 3353 | dp->df_count[idx_to] = new_count; |
| 3354 | |
| 3355 | if (start_skip == 0 && end_skip == 0) |
| 3356 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3357 | // Check if there are any other buffers and if the diff is |
| 3358 | // equal in them. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3359 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 910f66f | 2006-04-05 20:41:53 +0000 | [diff] [blame] | 3360 | if (curtab->tp_diffbuf[i] != NULL && i != idx_from |
| 3361 | && i != idx_to |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3362 | && !diff_equal_entry(dp, idx_from, i)) |
| 3363 | break; |
| 3364 | if (i == DB_COUNT) |
| 3365 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3366 | // delete the diff entry, the buffers are now equal here |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3367 | dfree = dp; |
| 3368 | dp = dp->df_next; |
| 3369 | if (dprev == NULL) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3370 | curtab->tp_first_diff = dp; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3371 | else |
| 3372 | dprev->df_next = dp; |
| 3373 | } |
| 3374 | } |
| 3375 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3376 | if (added != 0) |
| 3377 | { |
Bram Moolenaar | c5274dd | 2022-07-02 15:10:00 +0100 | [diff] [blame] | 3378 | // Adjust marks. This will change the following entries! |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3379 | mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added); |
| 3380 | if (curwin->w_cursor.lnum >= lnum) |
| 3381 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3382 | // Adjust the cursor position if it's in/after the changed |
| 3383 | // lines. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3384 | if (curwin->w_cursor.lnum >= lnum + count) |
| 3385 | curwin->w_cursor.lnum += added; |
| 3386 | else if (added < 0) |
| 3387 | curwin->w_cursor.lnum = lnum; |
| 3388 | } |
| 3389 | } |
| 3390 | changed_lines(lnum, 0, lnum + count, (long)added); |
| 3391 | |
| 3392 | if (dfree != NULL) |
| 3393 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3394 | // Diff is deleted, update folds in other windows. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3395 | #ifdef FEAT_FOLDING |
| 3396 | diff_fold_update(dfree, idx_to); |
| 3397 | #endif |
| 3398 | vim_free(dfree); |
| 3399 | } |
Bram Moolenaar | c5274dd | 2022-07-02 15:10:00 +0100 | [diff] [blame] | 3400 | |
| 3401 | // mark_adjust() may have made "dp" invalid. We don't know where |
| 3402 | // to continue then, bail out. |
| 3403 | if (added != 0 && !valid_diff(dp)) |
| 3404 | break; |
| 3405 | |
| 3406 | if (dfree == NULL) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3407 | // mark_adjust() may have changed the count in a wrong way |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3408 | dp->df_count[idx_to] = new_count; |
| 3409 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3410 | // When changing the current buffer, keep track of line numbers |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3411 | if (idx_cur == idx_to) |
| 3412 | off += added; |
| 3413 | } |
| 3414 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3415 | // If before the range or not deleted, go to next diff. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3416 | if (dfree == NULL) |
| 3417 | { |
| 3418 | dprev = dp; |
| 3419 | dp = dp->df_next; |
| 3420 | } |
| 3421 | } |
| 3422 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3423 | // restore curwin/curbuf and a few other things |
Bram Moolenaar | a9d52e3 | 2010-07-31 16:44:19 +0200 | [diff] [blame] | 3424 | if (eap->cmdidx != CMD_diffget) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3425 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3426 | // Syncing undo only works for the current buffer, but we change |
| 3427 | // another buffer. Sync undo if the command was typed. This isn't |
| 3428 | // 100% right when ":diffput" is used in a function or mapping. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3429 | if (KeyTyped) |
Bram Moolenaar | 779b74b | 2006-04-10 14:55:34 +0000 | [diff] [blame] | 3430 | u_sync(FALSE); |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3431 | aucmd_restbuf(&aco); |
| 3432 | } |
| 3433 | |
Bram Moolenaar | d2b58c0 | 2018-09-16 18:10:48 +0200 | [diff] [blame] | 3434 | theend: |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3435 | diff_busy = FALSE; |
Bram Moolenaar | d2b58c0 | 2018-09-16 18:10:48 +0200 | [diff] [blame] | 3436 | if (diff_need_update) |
Bram Moolenaar | d2b58c0 | 2018-09-16 18:10:48 +0200 | [diff] [blame] | 3437 | ex_diffupdate(NULL); |
Bram Moolenaar | df77cef | 2018-10-07 17:46:42 +0200 | [diff] [blame] | 3438 | |
Bram Moolenaar | 5f57bdc | 2018-10-25 17:52:23 +0200 | [diff] [blame] | 3439 | // Check that the cursor is on a valid character and update its |
Bram Moolenaar | df77cef | 2018-10-07 17:46:42 +0200 | [diff] [blame] | 3440 | // position. When there were filler lines the topline has become |
| 3441 | // invalid. |
| 3442 | check_cursor(); |
| 3443 | changed_line_abv_curs(); |
| 3444 | |
| 3445 | if (diff_need_update) |
| 3446 | // redraw already done by ex_diffupdate() |
| 3447 | diff_need_update = FALSE; |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 3448 | else |
| 3449 | { |
Bram Moolenaar | 198fa06 | 2018-09-18 21:20:26 +0200 | [diff] [blame] | 3450 | // Also need to redraw the other buffers. |
| 3451 | diff_redraw(FALSE); |
| 3452 | apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf); |
| 3453 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3454 | } |
| 3455 | |
| 3456 | #ifdef FEAT_FOLDING |
| 3457 | /* |
| 3458 | * Update folds for all diff buffers for entry "dp". |
| 3459 | * Skip buffer with index "skip_idx". |
| 3460 | * When there are no diffs, all folds are removed. |
| 3461 | */ |
| 3462 | static void |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3463 | diff_fold_update(diff_T *dp, int skip_idx) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3464 | { |
| 3465 | int i; |
| 3466 | win_T *wp; |
| 3467 | |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 3468 | FOR_ALL_WINDOWS(wp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3469 | for (i = 0; i < DB_COUNT; ++i) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3470 | if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3471 | foldUpdate(wp, dp->df_lnum[i], |
| 3472 | dp->df_lnum[i] + dp->df_count[i]); |
| 3473 | } |
| 3474 | #endif |
| 3475 | |
| 3476 | /* |
| 3477 | * Return TRUE if buffer "buf" is in diff-mode. |
| 3478 | */ |
| 3479 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3480 | diff_mode_buf(buf_T *buf) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3481 | { |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3482 | tabpage_T *tp; |
| 3483 | |
Bram Moolenaar | 2932359 | 2016-07-24 22:04:11 +0200 | [diff] [blame] | 3484 | FOR_ALL_TABPAGES(tp) |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3485 | if (diff_buf_idx_tp(buf, tp) != DB_COUNT) |
| 3486 | return TRUE; |
| 3487 | return FALSE; |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3488 | } |
| 3489 | |
| 3490 | /* |
| 3491 | * Move "count" times in direction "dir" to the next diff block. |
| 3492 | * Return FAIL if there isn't such a diff block. |
| 3493 | */ |
| 3494 | int |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3495 | diff_move_to(int dir, long count) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3496 | { |
| 3497 | int idx; |
| 3498 | linenr_T lnum = curwin->w_cursor.lnum; |
| 3499 | diff_T *dp; |
| 3500 | |
| 3501 | idx = diff_buf_idx(curbuf); |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3502 | if (idx == DB_COUNT || curtab->tp_first_diff == NULL) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3503 | return FAIL; |
| 3504 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3505 | if (curtab->tp_diff_invalid) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3506 | ex_diffupdate(NULL); // update after a big change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3507 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3508 | if (curtab->tp_first_diff == NULL) // no diffs today |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3509 | return FAIL; |
| 3510 | |
| 3511 | while (--count >= 0) |
| 3512 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3513 | // Check if already before first diff. |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3514 | if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx]) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3515 | break; |
| 3516 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3517 | for (dp = curtab->tp_first_diff; ; dp = dp->df_next) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3518 | { |
| 3519 | if (dp == NULL) |
| 3520 | break; |
| 3521 | if ((dir == FORWARD && lnum < dp->df_lnum[idx]) |
| 3522 | || (dir == BACKWARD |
| 3523 | && (dp->df_next == NULL |
| 3524 | || lnum <= dp->df_next->df_lnum[idx]))) |
| 3525 | { |
| 3526 | lnum = dp->df_lnum[idx]; |
| 3527 | break; |
| 3528 | } |
| 3529 | } |
| 3530 | } |
| 3531 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3532 | // don't end up past the end of the file |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3533 | if (lnum > curbuf->b_ml.ml_line_count) |
| 3534 | lnum = curbuf->b_ml.ml_line_count; |
| 3535 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3536 | // When the cursor didn't move at all we fail. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3537 | if (lnum == curwin->w_cursor.lnum) |
| 3538 | return FAIL; |
| 3539 | |
| 3540 | setpcmark(); |
| 3541 | curwin->w_cursor.lnum = lnum; |
| 3542 | curwin->w_cursor.col = 0; |
| 3543 | |
| 3544 | return OK; |
| 3545 | } |
| 3546 | |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3547 | /* |
| 3548 | * Return the line number in the current window that is closest to "lnum1" in |
| 3549 | * "buf1" in diff mode. |
| 3550 | */ |
| 3551 | static linenr_T |
| 3552 | diff_get_corresponding_line_int( |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3553 | buf_T *buf1, |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3554 | linenr_T lnum1) |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3555 | { |
| 3556 | int idx1; |
| 3557 | int idx2; |
| 3558 | diff_T *dp; |
| 3559 | int baseline = 0; |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3560 | |
| 3561 | idx1 = diff_buf_idx(buf1); |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3562 | idx2 = diff_buf_idx(curbuf); |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3563 | if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL) |
| 3564 | return lnum1; |
| 3565 | |
| 3566 | if (curtab->tp_diff_invalid) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3567 | ex_diffupdate(NULL); // update after a big change |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3568 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3569 | if (curtab->tp_first_diff == NULL) // no diffs today |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3570 | return lnum1; |
| 3571 | |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 3572 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3573 | { |
| 3574 | if (dp->df_lnum[idx1] > lnum1) |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3575 | return lnum1 - baseline; |
| 3576 | if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1) |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3577 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3578 | // Inside the diffblock |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3579 | baseline = lnum1 - dp->df_lnum[idx1]; |
| 3580 | if (baseline > dp->df_count[idx2]) |
| 3581 | baseline = dp->df_count[idx2]; |
| 3582 | |
| 3583 | return dp->df_lnum[idx2] + baseline; |
| 3584 | } |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3585 | if ( (dp->df_lnum[idx1] == lnum1) |
| 3586 | && (dp->df_count[idx1] == 0) |
| 3587 | && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum) |
| 3588 | && ((dp->df_lnum[idx2] + dp->df_count[idx2]) |
| 3589 | > curwin->w_cursor.lnum)) |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3590 | /* |
| 3591 | * Special case: if the cursor is just after a zero-count |
| 3592 | * block (i.e. all filler) and the target cursor is already |
| 3593 | * inside the corresponding block, leave the target cursor |
| 3594 | * unmoved. This makes repeated CTRL-W W operations work |
| 3595 | * as expected. |
| 3596 | */ |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3597 | return curwin->w_cursor.lnum; |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3598 | baseline = (dp->df_lnum[idx1] + dp->df_count[idx1]) |
| 3599 | - (dp->df_lnum[idx2] + dp->df_count[idx2]); |
| 3600 | } |
| 3601 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3602 | // If we get here then the cursor is after the last diff |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3603 | return lnum1 - baseline; |
| 3604 | } |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3605 | |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3606 | /* |
| 3607 | * Return the line number in the current window that is closest to "lnum1" in |
| 3608 | * "buf1" in diff mode. Checks the line number to be valid. |
| 3609 | */ |
| 3610 | linenr_T |
| 3611 | diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1) |
| 3612 | { |
| 3613 | linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1); |
| 3614 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3615 | // don't end up past the end of the file |
Bram Moolenaar | 025e3e0 | 2016-10-18 14:50:18 +0200 | [diff] [blame] | 3616 | if (lnum > curbuf->b_ml.ml_line_count) |
| 3617 | return curbuf->b_ml.ml_line_count; |
| 3618 | return lnum; |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3619 | } |
Bram Moolenaar | 860cae1 | 2010-06-05 23:22:07 +0200 | [diff] [blame] | 3620 | |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3621 | /* |
| 3622 | * For line "lnum" in the current window find the equivalent lnum in window |
| 3623 | * "wp", compensating for inserted/deleted lines. |
| 3624 | */ |
| 3625 | linenr_T |
Bram Moolenaar | 7454a06 | 2016-01-30 15:14:10 +0100 | [diff] [blame] | 3626 | diff_lnum_win(linenr_T lnum, win_T *wp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3627 | { |
| 3628 | diff_T *dp; |
| 3629 | int idx; |
| 3630 | int i; |
| 3631 | linenr_T n; |
| 3632 | |
| 3633 | idx = diff_buf_idx(curbuf); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3634 | if (idx == DB_COUNT) // safety check |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3635 | return (linenr_T)0; |
| 3636 | |
Bram Moolenaar | 49d7bf1 | 2006-02-17 21:45:41 +0000 | [diff] [blame] | 3637 | if (curtab->tp_diff_invalid) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3638 | ex_diffupdate(NULL); // update after a big change |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3639 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3640 | // search for a change that includes "lnum" in the list of diffblocks. |
Bram Moolenaar | aeea721 | 2020-04-02 18:50:46 +0200 | [diff] [blame] | 3641 | FOR_ALL_DIFFBLOCKS_IN_TAB(curtab, dp) |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3642 | if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) |
| 3643 | break; |
| 3644 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3645 | // When after the last change, compute relative to the last line number. |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3646 | if (dp == NULL) |
| 3647 | return wp->w_buffer->b_ml.ml_line_count |
| 3648 | - (curbuf->b_ml.ml_line_count - lnum); |
| 3649 | |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3650 | // Find index for "wp". |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3651 | i = diff_buf_idx(wp->w_buffer); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3652 | if (i == DB_COUNT) // safety check |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3653 | return (linenr_T)0; |
| 3654 | |
| 3655 | n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]); |
| 3656 | if (n > dp->df_lnum[i] + dp->df_count[i]) |
| 3657 | n = dp->df_lnum[i] + dp->df_count[i]; |
| 3658 | return n; |
| 3659 | } |
Bram Moolenaar | 071d427 | 2004-06-13 20:20:40 +0000 | [diff] [blame] | 3660 | |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3661 | /* |
| 3662 | * Handle an ED style diff line. |
| 3663 | * Return FAIL if the line does not contain diff info. |
| 3664 | */ |
| 3665 | static int |
| 3666 | parse_diff_ed( |
| 3667 | char_u *line, |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3668 | diffhunk_T *hunk) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3669 | { |
| 3670 | char_u *p; |
| 3671 | long f1, l1, f2, l2; |
| 3672 | int difftype; |
| 3673 | |
| 3674 | // The line must be one of three formats: |
| 3675 | // change: {first}[,{last}]c{first}[,{last}] |
| 3676 | // append: {first}a{first}[,{last}] |
| 3677 | // delete: {first}[,{last}]d{first} |
| 3678 | p = line; |
| 3679 | f1 = getdigits(&p); |
| 3680 | if (*p == ',') |
| 3681 | { |
| 3682 | ++p; |
| 3683 | l1 = getdigits(&p); |
| 3684 | } |
| 3685 | else |
| 3686 | l1 = f1; |
| 3687 | if (*p != 'a' && *p != 'c' && *p != 'd') |
| 3688 | return FAIL; // invalid diff format |
| 3689 | difftype = *p++; |
| 3690 | f2 = getdigits(&p); |
| 3691 | if (*p == ',') |
| 3692 | { |
| 3693 | ++p; |
| 3694 | l2 = getdigits(&p); |
| 3695 | } |
| 3696 | else |
| 3697 | l2 = f2; |
| 3698 | if (l1 < f1 || l2 < f2) |
| 3699 | return FAIL; |
| 3700 | |
| 3701 | if (difftype == 'a') |
| 3702 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3703 | hunk->lnum_orig = f1 + 1; |
| 3704 | hunk->count_orig = 0; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3705 | } |
| 3706 | else |
| 3707 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3708 | hunk->lnum_orig = f1; |
| 3709 | hunk->count_orig = l1 - f1 + 1; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3710 | } |
| 3711 | if (difftype == 'd') |
| 3712 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3713 | hunk->lnum_new = f2 + 1; |
| 3714 | hunk->count_new = 0; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3715 | } |
| 3716 | else |
| 3717 | { |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3718 | hunk->lnum_new = f2; |
| 3719 | hunk->count_new = l2 - f2 + 1; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3720 | } |
| 3721 | return OK; |
| 3722 | } |
| 3723 | |
| 3724 | /* |
| 3725 | * Parses unified diff with zero(!) context lines. |
| 3726 | * Return FAIL if there is no diff information in "line". |
| 3727 | */ |
| 3728 | static int |
| 3729 | parse_diff_unified( |
| 3730 | char_u *line, |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3731 | diffhunk_T *hunk) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3732 | { |
| 3733 | char_u *p; |
| 3734 | long oldline, oldcount, newline, newcount; |
| 3735 | |
| 3736 | // Parse unified diff hunk header: |
| 3737 | // @@ -oldline,oldcount +newline,newcount @@ |
| 3738 | p = line; |
| 3739 | if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-') |
| 3740 | { |
| 3741 | oldline = getdigits(&p); |
| 3742 | if (*p == ',') |
| 3743 | { |
| 3744 | ++p; |
| 3745 | oldcount = getdigits(&p); |
| 3746 | } |
| 3747 | else |
| 3748 | oldcount = 1; |
| 3749 | if (*p++ == ' ' && *p++ == '+') |
| 3750 | { |
| 3751 | newline = getdigits(&p); |
| 3752 | if (*p == ',') |
| 3753 | { |
| 3754 | ++p; |
| 3755 | newcount = getdigits(&p); |
| 3756 | } |
| 3757 | else |
| 3758 | newcount = 1; |
| 3759 | } |
| 3760 | else |
| 3761 | return FAIL; // invalid diff format |
| 3762 | |
| 3763 | if (oldcount == 0) |
| 3764 | oldline += 1; |
| 3765 | if (newcount == 0) |
| 3766 | newline += 1; |
| 3767 | if (newline == 0) |
| 3768 | newline = 1; |
| 3769 | |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3770 | hunk->lnum_orig = oldline; |
| 3771 | hunk->count_orig = oldcount; |
| 3772 | hunk->lnum_new = newline; |
| 3773 | hunk->count_new = newcount; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3774 | |
| 3775 | return OK; |
| 3776 | } |
| 3777 | |
| 3778 | return FAIL; |
| 3779 | } |
| 3780 | |
| 3781 | /* |
| 3782 | * Callback function for the xdl_diff() function. |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3783 | * Stores the diff output (indices) in a grow array. |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3784 | */ |
| 3785 | static int |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3786 | xdiff_out_indices( |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3787 | long start_a, |
| 3788 | long count_a, |
| 3789 | long start_b, |
| 3790 | long count_b, |
| 3791 | void *priv) |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3792 | { |
| 3793 | diffout_T *dout = (diffout_T *)priv; |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3794 | diffhunk_T *p = ALLOC_ONE(diffhunk_T); |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3795 | |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3796 | if (p == NULL) |
| 3797 | return -1; |
Bram Moolenaar | f080d70 | 2018-10-31 22:57:26 +0100 | [diff] [blame] | 3798 | |
| 3799 | if (ga_grow(&dout->dout_ga, 1) == FAIL) |
Bram Moolenaar | febb78f | 2021-12-29 11:59:53 +0000 | [diff] [blame] | 3800 | { |
| 3801 | vim_free(p); |
Bram Moolenaar | f080d70 | 2018-10-31 22:57:26 +0100 | [diff] [blame] | 3802 | return -1; |
Bram Moolenaar | febb78f | 2021-12-29 11:59:53 +0000 | [diff] [blame] | 3803 | } |
Lewis Russell | d9da86e | 2021-12-28 13:54:41 +0000 | [diff] [blame] | 3804 | |
| 3805 | p->lnum_orig = start_a + 1; |
| 3806 | p->count_orig = count_a; |
| 3807 | p->lnum_new = start_b + 1; |
| 3808 | p->count_new = count_b; |
| 3809 | ((diffhunk_T **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p; |
Bram Moolenaar | e828b76 | 2018-09-10 17:51:58 +0200 | [diff] [blame] | 3810 | return 0; |
| 3811 | } |
| 3812 | |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3813 | /* |
| 3814 | * Callback function for the xdl_diff() function. |
| 3815 | * Stores the unified diff output in a grow array. |
| 3816 | */ |
| 3817 | static int |
| 3818 | xdiff_out_unified( |
| 3819 | void *priv, |
| 3820 | mmbuffer_t *mb, |
| 3821 | int nbuf) |
| 3822 | { |
| 3823 | diffout_T *dout = (diffout_T *)priv; |
| 3824 | int i; |
| 3825 | |
| 3826 | for (i = 0; i < nbuf; i++) |
| 3827 | ga_concat_len(&dout->dout_ga, (char_u *)mb[i].ptr, mb[i].size); |
| 3828 | |
| 3829 | return 0; |
| 3830 | } |
| 3831 | |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3832 | #endif // FEAT_DIFF |
| 3833 | |
| 3834 | #if defined(FEAT_EVAL) || defined(PROTO) |
| 3835 | |
| 3836 | /* |
| 3837 | * "diff_filler()" function |
| 3838 | */ |
| 3839 | void |
| 3840 | f_diff_filler(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
| 3841 | { |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 3842 | # ifdef FEAT_DIFF |
Yegappan Lakshmanan | 4490ec4 | 2021-07-27 22:00:44 +0200 | [diff] [blame] | 3843 | if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL) |
| 3844 | return; |
| 3845 | |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3846 | rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars)); |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 3847 | # endif |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3848 | } |
| 3849 | |
| 3850 | /* |
| 3851 | * "diff_hlID()" function |
| 3852 | */ |
| 3853 | void |
| 3854 | f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
| 3855 | { |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 3856 | # ifdef FEAT_DIFF |
Yegappan Lakshmanan | a9a7c0c | 2021-07-17 19:11:07 +0200 | [diff] [blame] | 3857 | linenr_T lnum; |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3858 | static linenr_T prev_lnum = 0; |
| 3859 | static varnumber_T changedtick = 0; |
| 3860 | static int fnum = 0; |
| 3861 | static int change_start = 0; |
| 3862 | static int change_end = 0; |
| 3863 | static hlf_T hlID = (hlf_T)0; |
| 3864 | int filler_lines; |
| 3865 | int col; |
| 3866 | |
Yegappan Lakshmanan | a9a7c0c | 2021-07-17 19:11:07 +0200 | [diff] [blame] | 3867 | if (in_vim9script() |
Yegappan Lakshmanan | cd91720 | 2021-07-21 19:09:09 +0200 | [diff] [blame] | 3868 | && (check_for_lnum_arg(argvars,0) == FAIL |
Yegappan Lakshmanan | a9a7c0c | 2021-07-17 19:11:07 +0200 | [diff] [blame] | 3869 | || check_for_number_arg(argvars, 1) == FAIL)) |
| 3870 | return; |
| 3871 | |
| 3872 | lnum = tv_get_lnum(argvars); |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3873 | if (lnum < 0) // ignore type error in {lnum} arg |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3874 | lnum = 0; |
| 3875 | if (lnum != prev_lnum |
| 3876 | || changedtick != CHANGEDTICK(curbuf) |
| 3877 | || fnum != curbuf->b_fnum) |
| 3878 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3879 | // New line, buffer, change: need to get the values. |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 3880 | int linestatus = 0; |
| 3881 | filler_lines = diff_check_with_linestatus(curwin, lnum, &linestatus); |
| 3882 | if (filler_lines < 0 || linestatus < 0) |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3883 | { |
Jonathon | 7c7a4e6 | 2025-01-12 09:58:00 +0100 | [diff] [blame] | 3884 | if (filler_lines == -1 || linestatus == -1) |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3885 | { |
| 3886 | change_start = MAXCOL; |
| 3887 | change_end = -1; |
| 3888 | if (diff_find_change(curwin, lnum, &change_start, &change_end)) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3889 | hlID = HLF_ADD; // added line |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3890 | else |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3891 | hlID = HLF_CHD; // changed line |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3892 | } |
| 3893 | else |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3894 | hlID = HLF_ADD; // added line |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3895 | } |
| 3896 | else |
| 3897 | hlID = (hlf_T)0; |
| 3898 | prev_lnum = lnum; |
| 3899 | changedtick = CHANGEDTICK(curbuf); |
| 3900 | fnum = curbuf->b_fnum; |
| 3901 | } |
| 3902 | |
| 3903 | if (hlID == HLF_CHD || hlID == HLF_TXD) |
| 3904 | { |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3905 | col = tv_get_number(&argvars[1]) - 1; // ignore type error in {col} |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3906 | if (col >= change_start && col <= change_end) |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3907 | hlID = HLF_TXD; // changed text |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3908 | else |
Bram Moolenaar | 5d18efe | 2019-12-01 21:11:22 +0100 | [diff] [blame] | 3909 | hlID = HLF_CHD; // changed line |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3910 | } |
| 3911 | rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID; |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 3912 | # endif |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 3913 | } |
| 3914 | |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 3915 | # ifdef FEAT_DIFF |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3916 | /* |
| 3917 | * Parse the diff options passed in "optarg" to the diff() function and return |
| 3918 | * the options in "diffopts" and the diff algorithm in "diffalgo". |
| 3919 | */ |
| 3920 | static int |
| 3921 | parse_diff_optarg( |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 3922 | typval_T *opts, |
| 3923 | int *diffopts, |
| 3924 | long *diffalgo, |
| 3925 | dio_outfmt_T *diff_output_fmt, |
| 3926 | int *diff_ctxlen) |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3927 | { |
| 3928 | dict_T *d = opts->vval.v_dict; |
| 3929 | |
| 3930 | char_u *algo = dict_get_string(d, "algorithm", FALSE); |
| 3931 | if (algo != NULL) |
| 3932 | { |
| 3933 | if (STRNCMP(algo, "myers", 5) == 0) |
| 3934 | *diffalgo = 0; |
| 3935 | else if (STRNCMP(algo, "minimal", 7) == 0) |
| 3936 | *diffalgo = XDF_NEED_MINIMAL; |
| 3937 | else if (STRNCMP(algo, "patience", 8) == 0) |
| 3938 | *diffalgo = XDF_PATIENCE_DIFF; |
| 3939 | else if (STRNCMP(algo, "histogram", 9) == 0) |
| 3940 | *diffalgo = XDF_HISTOGRAM_DIFF; |
| 3941 | } |
| 3942 | |
| 3943 | char_u *output_fmt = dict_get_string(d, "output", FALSE); |
| 3944 | if (output_fmt != NULL) |
| 3945 | { |
| 3946 | if (STRNCMP(output_fmt, "unified", 7) == 0) |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 3947 | *diff_output_fmt = DIO_OUTPUT_UNIFIED; |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3948 | else if (STRNCMP(output_fmt, "indices", 7) == 0) |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 3949 | *diff_output_fmt = DIO_OUTPUT_INDICES; |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3950 | else |
| 3951 | { |
| 3952 | semsg(_(e_unsupported_diff_output_format_str), output_fmt); |
| 3953 | return FAIL; |
| 3954 | } |
| 3955 | } |
| 3956 | |
Yegappan Lakshmanan | a0010a1 | 2024-02-12 20:21:26 +0100 | [diff] [blame] | 3957 | *diff_ctxlen = dict_get_number_def(d, "context", 0); |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 3958 | if (*diff_ctxlen < 0) |
Yegappan Lakshmanan | a0010a1 | 2024-02-12 20:21:26 +0100 | [diff] [blame] | 3959 | *diff_ctxlen = 0; |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 3960 | |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 3961 | if (dict_get_bool(d, "iblank", FALSE)) |
| 3962 | *diffopts |= DIFF_IBLANK; |
| 3963 | if (dict_get_bool(d, "icase", FALSE)) |
| 3964 | *diffopts |= DIFF_ICASE; |
| 3965 | if (dict_get_bool(d, "iwhite", FALSE)) |
| 3966 | *diffopts |= DIFF_IWHITE; |
| 3967 | if (dict_get_bool(d, "iwhiteall", FALSE)) |
| 3968 | *diffopts |= DIFF_IWHITEALL; |
| 3969 | if (dict_get_bool(d, "iwhiteeol", FALSE)) |
| 3970 | *diffopts |= DIFF_IWHITEEOL; |
| 3971 | if (dict_get_bool(d, "indent-heuristic", FALSE)) |
| 3972 | *diffalgo |= XDF_INDENT_HEURISTIC; |
| 3973 | |
| 3974 | return OK; |
| 3975 | } |
| 3976 | |
| 3977 | /* |
| 3978 | * Concatenate the List of strings in "l" and store the result in |
| 3979 | * "din->din_mmfile.ptr" and the length in "din->din_mmfile.size". |
| 3980 | */ |
| 3981 | static void |
| 3982 | list_to_diffin(list_T *l, diffin_T *din, int icase) |
| 3983 | { |
| 3984 | garray_T ga; |
| 3985 | listitem_T *li; |
| 3986 | char_u *str; |
| 3987 | |
| 3988 | ga_init2(&ga, 512, 4); |
| 3989 | |
| 3990 | FOR_ALL_LIST_ITEMS(l, li) |
| 3991 | { |
| 3992 | str = tv_get_string(&li->li_tv); |
| 3993 | if (icase) |
| 3994 | { |
| 3995 | str = strlow_save(str); |
| 3996 | if (str == NULL) |
| 3997 | continue; |
| 3998 | } |
| 3999 | ga_concat(&ga, str); |
| 4000 | ga_concat(&ga, (char_u *)NL_STR); |
| 4001 | if (icase) |
| 4002 | vim_free(str); |
| 4003 | } |
| 4004 | if (ga.ga_len > 0) |
| 4005 | ((char *)ga.ga_data)[ga.ga_len] = NUL; |
| 4006 | |
| 4007 | din->din_mmfile.ptr = (char *)ga.ga_data; |
| 4008 | din->din_mmfile.size = ga.ga_len; |
| 4009 | } |
| 4010 | |
| 4011 | /* |
| 4012 | * Get the start and end indices from the diff "hunk". |
| 4013 | */ |
| 4014 | static dict_T * |
| 4015 | get_diff_hunk_indices(diffhunk_T *hunk) |
| 4016 | { |
| 4017 | dict_T *hunk_dict; |
| 4018 | |
| 4019 | hunk_dict = dict_alloc(); |
| 4020 | if (hunk_dict == NULL) |
| 4021 | return NULL; |
| 4022 | |
| 4023 | dict_add_number(hunk_dict, "from_idx", hunk->lnum_orig - 1); |
| 4024 | dict_add_number(hunk_dict, "from_count", hunk->count_orig); |
| 4025 | dict_add_number(hunk_dict, "to_idx", hunk->lnum_new - 1); |
| 4026 | dict_add_number(hunk_dict, "to_count", hunk->count_new); |
| 4027 | |
| 4028 | return hunk_dict; |
| 4029 | } |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 4030 | # endif |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4031 | |
| 4032 | /* |
| 4033 | * "diff()" function |
| 4034 | */ |
| 4035 | void |
| 4036 | f_diff(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
| 4037 | { |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 4038 | # ifdef FEAT_DIFF |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4039 | diffio_T dio; |
| 4040 | |
| 4041 | if (check_for_nonnull_list_arg(argvars, 0) == FAIL |
| 4042 | || check_for_nonnull_list_arg(argvars, 1) == FAIL |
| 4043 | || check_for_opt_nonnull_dict_arg(argvars, 2) == FAIL) |
| 4044 | return; |
| 4045 | |
| 4046 | CLEAR_FIELD(dio); |
| 4047 | dio.dio_internal = TRUE; |
| 4048 | ga_init2(&dio.dio_diff.dout_ga, sizeof(char *), 1000); |
| 4049 | |
| 4050 | list_T *orig_list = argvars[0].vval.v_list; |
| 4051 | list_T *new_list = argvars[1].vval.v_list; |
| 4052 | |
| 4053 | // Save the 'diffopt' option value and restore it after getting the diff. |
| 4054 | int save_diff_flags = diff_flags; |
| 4055 | long save_diff_algorithm = diff_algorithm; |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4056 | diff_flags = DIFF_INTERNAL; |
| 4057 | diff_algorithm = 0; |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 4058 | dio.dio_outfmt = DIO_OUTPUT_UNIFIED; |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4059 | if (argvars[2].v_type != VAR_UNKNOWN) |
| 4060 | if (parse_diff_optarg(&argvars[2], &diff_flags, &diff_algorithm, |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 4061 | &dio.dio_outfmt, &dio.dio_ctxlen) == FAIL) |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4062 | return; |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4063 | |
| 4064 | // Concatenate the List of strings into a single string using newline |
| 4065 | // separator. Internal diff library expects a single string. |
| 4066 | list_to_diffin(orig_list, &dio.dio_orig, diff_flags & DIFF_ICASE); |
| 4067 | list_to_diffin(new_list, &dio.dio_new, diff_flags & DIFF_ICASE); |
| 4068 | |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 4069 | // If 'diffexpr' is set, then the internal diff is not used. Set |
| 4070 | // 'diffexpr' to an empty string temporarily. |
| 4071 | int restore_diffexpr = FALSE; |
| 4072 | char_u cc = *p_dex; |
| 4073 | if (*p_dex != NUL) |
| 4074 | { |
| 4075 | restore_diffexpr = TRUE; |
| 4076 | *p_dex = NUL; |
| 4077 | } |
| 4078 | |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4079 | // Compute the diff |
| 4080 | int diff_status = diff_file(&dio); |
| 4081 | |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 4082 | // restore 'diffexpr' |
| 4083 | if (restore_diffexpr) |
| 4084 | *p_dex = cc; |
| 4085 | |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4086 | if (diff_status == FAIL) |
| 4087 | goto done; |
| 4088 | |
| 4089 | int hunk_idx = 0; |
| 4090 | dict_T *hunk_dict; |
| 4091 | |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 4092 | if (dio.dio_outfmt == DIO_OUTPUT_INDICES) |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4093 | { |
| 4094 | if (rettv_list_alloc(rettv) != OK) |
| 4095 | goto done; |
| 4096 | list_T *l = rettv->vval.v_list; |
| 4097 | |
| 4098 | // Process each diff hunk |
| 4099 | diffhunk_T *hunk = NULL; |
| 4100 | while (hunk_idx < dio.dio_diff.dout_ga.ga_len) |
| 4101 | { |
| 4102 | hunk = ((diffhunk_T **)dio.dio_diff.dout_ga.ga_data)[hunk_idx++]; |
| 4103 | |
| 4104 | hunk_dict = get_diff_hunk_indices(hunk); |
| 4105 | if (hunk_dict == NULL) |
| 4106 | goto done; |
| 4107 | |
| 4108 | list_append_dict(l, hunk_dict); |
| 4109 | } |
| 4110 | } |
| 4111 | else |
| 4112 | { |
| 4113 | ga_append(&dio.dio_diff.dout_ga, NUL); |
| 4114 | rettv->v_type = VAR_STRING; |
| 4115 | rettv->vval.v_string = |
| 4116 | vim_strsave((char_u *)dio.dio_diff.dout_ga.ga_data); |
| 4117 | } |
| 4118 | |
| 4119 | done: |
| 4120 | clear_diffin(&dio.dio_new); |
Yegappan Lakshmanan | be156a3 | 2024-02-11 17:08:29 +0100 | [diff] [blame] | 4121 | if (dio.dio_outfmt == DIO_OUTPUT_INDICES) |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4122 | clear_diffout(&dio.dio_diff); |
| 4123 | else |
| 4124 | ga_clear(&dio.dio_diff.dout_ga); |
| 4125 | clear_diffin(&dio.dio_orig); |
| 4126 | // Restore the 'diffopt' option value. |
| 4127 | diff_flags = save_diff_flags; |
| 4128 | diff_algorithm = save_diff_algorithm; |
Yegappan Lakshmanan | 6093703 | 2024-02-03 17:41:54 +0100 | [diff] [blame] | 4129 | # endif |
Yegappan Lakshmanan | fa37835 | 2024-02-01 22:05:27 +0100 | [diff] [blame] | 4130 | } |
| 4131 | |
Bram Moolenaar | af7645d | 2019-09-05 22:33:28 +0200 | [diff] [blame] | 4132 | #endif |