IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22532 from zeertzjq/vim-9.0.0736

Browse Source 
vim-patch:9.0.{0736,0749,0770,0870}: quickfix listing does not handle very long messages
This commit is contained in:
zeertzjq 2023-03-05 17:30:04 +08:00 committed by GitHub
commit 836733dad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 178 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/memory.c
View File

@ -755,11 +755,7 @@ void free_all_mem(void)
p_hi = 0;
init_history();
qf_free_all(NULL);
// Free all location lists
FOR_ALL_TAB_WINDOWS(tab, win) {
qf_free_all(win);
}
free_quickfix();
// Close all script inputs.
close_all_scripts();

198
src/nvim/quickfix.c
View File

@ -245,6 +245,10 @@ typedef struct vgr_args_S {
#endif
static char *e_no_more_items = N_("E553: No more items");
static char *e_current_quickfix_list_was_changed =
N_("E925: Current quickfix list was changed");
static char *e_current_location_list_was_changed =
N_("E926: Current location list was changed");
// Quickfix window check helper macro
#define IS_QF_WINDOW(wp) (bt_quickfix((wp)->w_buffer) && (wp)->w_llist_ref == NULL)
@ -275,10 +279,38 @@ static char *e_no_more_items = N_("E553: No more items");
static char *qf_last_bufname = NULL;
static bufref_T qf_last_bufref = { NULL, 0, 0 };
static char *e_current_quickfix_list_was_changed =
N_("E925: Current quickfix list was changed");
static char *e_current_location_list_was_changed =
N_("E926: Current location list was changed");
static garray_T qfga;
/// Get a growarray to buffer text in. Shared between various commands to avoid
/// many alloc/free calls.
static garray_T *qfga_get(void)
{
static bool initialized = false;
if (!initialized) {
initialized = true;
ga_init(&qfga, 1, 256);
}
// Reset the length to zero. Retain ga_data from previous use to avoid
// many alloc/free calls.
qfga.ga_len = 0;
return &qfga;
}
/// The "qfga" grow array buffer is reused across multiple quickfix commands as
/// a temporary buffer to reduce the number of alloc/free calls. But if the
/// buffer size is large, then to avoid holding on to that memory, clear the
/// grow array. Otherwise just reset the grow array length.
static void qfga_clear(void)
{
if (qfga.ga_maxlen > 1000) {
ga_clear(&qfga);
} else {
qfga.ga_len = 0;
}
}
// Counter to prevent autocmds from freeing up location lists when they are
// still being used.
@ -2799,6 +2831,8 @@ static void qf_jump_goto_line(linenr_T qf_lnum, int qf_col, char qf_viscol, char
static void qf_jump_print_msg(qf_info_T *qi, int qf_index, qfline_T *qf_ptr, buf_T *old_curbuf,
linenr_T old_lnum)
{
garray_T *const gap = qfga_get();
// Update the screen before showing the message, unless the screen
// scrolled up.
if (!msg_scrolled) {
@ -2807,13 +2841,13 @@ static void qf_jump_print_msg(qf_info_T *qi, int qf_index, qfline_T *qf_ptr, buf
update_screen();
}
}
snprintf(IObuff, IOSIZE, _("(%d of %d)%s%s: "), qf_index,
qf_get_curlist(qi)->qf_count,
qf_ptr->qf_cleared ? _(" (line deleted)") : "",
qf_types(qf_ptr->qf_type, qf_ptr->qf_nr));
vim_snprintf(IObuff, IOSIZE, _("(%d of %d)%s%s: "), qf_index,
qf_get_curlist(qi)->qf_count,
qf_ptr->qf_cleared ? _(" (line deleted)") : "",
qf_types(qf_ptr->qf_type, qf_ptr->qf_nr));
// Add the message, skipping leading whitespace and newlines.
int len = (int)strlen(IObuff);
qf_fmt_text(skipwhite(qf_ptr->qf_text), IObuff + len, IOSIZE - len);
ga_concat(gap, IObuff);
qf_fmt_text(gap, skipwhite(qf_ptr->qf_text));
// Output the message. Overwrite to avoid scrolling when the 'O'
// flag is present in 'shortmess'; But when not jumping, print the
@ -2825,8 +2859,10 @@ static void qf_jump_print_msg(qf_info_T *qi, int qf_index, qfline_T *qf_ptr, buf
msg_scroll = false;
}
msg_ext_set_kind("quickfix");
msg_attr_keep(IObuff, 0, true, false);
msg_attr_keep(gap->ga_data, 0, true, false);
msg_scroll = (int)i;
qfga_clear();
}
/// Find a usable window for opening a file from the quickfix/location list. If
@ -3086,41 +3122,30 @@ static void qf_list_entry(qfline_T *qfp, int qf_idx, bool cursel)
if (qfp->qf_lnum != 0) {
msg_puts_attr(":", qfSepAttr);
}
garray_T *gap = qfga_get();
if (qfp->qf_lnum == 0) {
IObuff[0] = NUL;
ga_append(gap, NUL);
} else {
qf_range_text(qfp, IObuff, IOSIZE);
qf_range_text(gap, qfp);
}
vim_snprintf(IObuff + strlen(IObuff), IOSIZE, "%s", qf_types(qfp->qf_type, qfp->qf_nr));
msg_puts_attr((const char *)IObuff, qfLineAttr);
ga_concat(gap, qf_types(qfp->qf_type, qfp->qf_nr));
ga_append(gap, NUL);
msg_puts_attr(gap->ga_data, qfLineAttr);
msg_puts_attr(":", qfSepAttr);
if (qfp->qf_pattern != NULL) {
qf_fmt_text(qfp->qf_pattern, IObuff, IOSIZE);
msg_puts((const char *)IObuff);
gap = qfga_get();
qf_fmt_text(gap, qfp->qf_pattern);
msg_puts(gap->ga_data);
msg_puts_attr(":", qfSepAttr);
}
msg_puts(" ");
char *tbuf = IObuff;
size_t tbuflen = IOSIZE;
size_t len = strlen(qfp->qf_text) + 3;
if (len > IOSIZE) {
tbuf = xmalloc(len);
tbuflen = len;
}
// Remove newlines and leading whitespace from the text. For an
// unrecognized line keep the indent, the compiler may mark a word
// with ^^^^.
qf_fmt_text((fname != NULL || qfp->qf_lnum != 0)
? skipwhite(qfp->qf_text) : qfp->qf_text,
tbuf, (int)tbuflen);
msg_prt_line(tbuf, false);
if (tbuf != IObuff) {
xfree(tbuf);
}
gap = qfga_get();
qf_fmt_text(gap, (fname != NULL || qfp->qf_lnum != 0) ? skipwhite(qfp->qf_text) : qfp->qf_text);
msg_prt_line(gap->ga_data, false);
}
// ":clist": list all errors
@ -3195,51 +3220,57 @@ void qf_list(exarg_T *eap)
}
os_breakcheck();
}
qfga_clear();
}
// Remove newlines and leading whitespace from an error message.
// Put the result in "buf[bufsize]".
static void qf_fmt_text(const char *restrict text, char *restrict buf, int bufsize)
/// Remove newlines and leading whitespace from an error message.
/// Add the result to the grow array "gap".
static void qf_fmt_text(garray_T *gap, const char *restrict text)
FUNC_ATTR_NONNULL_ALL
{
int i;
const char *p = (char *)text;
for (i = 0; *p != NUL && i < bufsize - 1; i++) {
while (*p != NUL) {
if (*p == '\n') {
buf[i] = ' ';
ga_append(gap, ' ');
while (*++p != NUL) {
if (!ascii_iswhite(*p) && *p != '\n') {
break;
}
}
} else {
buf[i] = *p++;
ga_append(gap, (uint8_t)(*p++));
}
}
buf[i] = NUL;
ga_append(gap, NUL);
}
// Range information from lnum, col, end_lnum, and end_col.
// Put the result in "buf[bufsize]".
static void qf_range_text(const qfline_T *qfp, char *buf, int bufsize)
/// Add the range information from the lnum, col, end_lnum, and end_col values
/// of a quickfix entry to the grow array "gap".
static void qf_range_text(garray_T *gap, const qfline_T *qfp)
{
vim_snprintf(buf, (size_t)bufsize, "%" PRIdLINENR, qfp->qf_lnum);
int len = (int)strlen(buf);
char *const buf = IObuff;
const size_t bufsize = IOSIZE;
vim_snprintf(buf, bufsize, "%" PRIdLINENR, qfp->qf_lnum);
size_t len = strlen(buf);
if (qfp->qf_end_lnum > 0 && qfp->qf_lnum != qfp->qf_end_lnum) {
vim_snprintf(buf + len, (size_t)(bufsize - len), "-%" PRIdLINENR, qfp->qf_end_lnum);
len += (int)strlen(buf + len);
vim_snprintf(buf + len, bufsize - len, "-%" PRIdLINENR, qfp->qf_end_lnum);
len += strlen(buf + len);
}
if (qfp->qf_col > 0) {
vim_snprintf(buf + len, (size_t)(bufsize - len), " col %d", qfp->qf_col);
len += (int)strlen(buf + len);
vim_snprintf(buf + len, bufsize - len, " col %d", qfp->qf_col);
len += strlen(buf + len);
if (qfp->qf_end_col > 0 && qfp->qf_col != qfp->qf_end_col) {
vim_snprintf(buf + len, (size_t)(bufsize - len), "-%d", qfp->qf_end_col);
len += (int)strlen(buf + len);
vim_snprintf(buf + len, bufsize - len, "-%d", qfp->qf_end_col);
len += strlen(buf + len);
}
}
buf[len] = NUL;
ga_concat_len(gap, buf, len);
}
/// Display information (list number, list size and the title) about a
@ -3945,21 +3976,22 @@ static int qf_buf_add_line(qf_list_T *qfl, buf_T *buf, linenr_T lnum, const qfli
char *dirname, char *qftf_str, bool first_bufline)
FUNC_ATTR_NONNULL_ARG(1, 2, 4, 5)
{
garray_T *gap = qfga_get();
// If the 'quickfixtextfunc' function returned a non-empty custom string
// for this entry, then use it.
if (qftf_str != NULL && *qftf_str != NUL) {
xstrlcpy(IObuff, qftf_str, IOSIZE);
ga_concat(gap, qftf_str);
ga_append(gap, NUL);
} else {
buf_T *errbuf;
int len;
if (qfp->qf_module != NULL) {
xstrlcpy(IObuff, qfp->qf_module, IOSIZE);
len = (int)strlen(IObuff);
ga_concat(gap, qfp->qf_module);
} else if (qfp->qf_fnum != 0
&& (errbuf = buflist_findnr(qfp->qf_fnum)) != NULL
&& errbuf->b_fname != NULL) {
if (qfp->qf_type == 1) { // :helpgrep
xstrlcpy(IObuff, path_tail(errbuf->b_fname), IOSIZE);
ga_concat(gap, path_tail(errbuf->b_fname));
} else {
// Shorten the file name if not done already.
// For optimization, do this only for the first entry in a
@ -3972,42 +4004,31 @@ static int qf_buf_add_line(qf_list_T *qfl, buf_T *buf, linenr_T lnum, const qfli
}
shorten_buf_fname(errbuf, dirname, false);
}
xstrlcpy(IObuff, errbuf->b_fname, IOSIZE);
ga_concat(gap, errbuf->b_fname);
}
len = (int)strlen(IObuff);
} else {
len = 0;
}
if (len < IOSIZE - 1) {
IObuff[len++] = '|';
}
if (qfp->qf_lnum > 0) {
qf_range_text(qfp, IObuff + len, IOSIZE - len);
len += (int)strlen(IObuff + len);
snprintf(IObuff + len, (size_t)(IOSIZE - len), "%s", qf_types(qfp->qf_type,
qfp->qf_nr));
len += (int)strlen(IObuff + len);
ga_append(gap, '|');
if (qfp->qf_lnum > 0) {
qf_range_text(gap, qfp);
ga_concat(gap, qf_types(qfp->qf_type, qfp->qf_nr));
} else if (qfp->qf_pattern != NULL) {
qf_fmt_text(qfp->qf_pattern, IObuff + len, IOSIZE - len);
len += (int)strlen(IObuff + len);
}
if (len < IOSIZE - 2) {
IObuff[len++] = '|';
IObuff[len++] = ' ';
qf_fmt_text(gap, qfp->qf_pattern);
}
ga_append(gap, '|');
ga_append(gap, ' ');
// Remove newlines and leading whitespace from the text.
// For an unrecognized line keep the indent, the compiler may
// mark a word with ^^^^.
qf_fmt_text(len > 3 ? skipwhite(qfp->qf_text) : qfp->qf_text,
IObuff + len, IOSIZE - len);
qf_fmt_text(gap, gap->ga_len > 3 ? skipwhite(qfp->qf_text) : qfp->qf_text);
}
if (ml_append_buf(buf, lnum, IObuff,
(colnr_T)strlen(IObuff) + 1, false) == FAIL) {
if (ml_append_buf(buf, lnum, gap->ga_data, gap->ga_len, false) == FAIL) {
return FAIL;
}
return OK;
}
@ -4142,6 +4163,8 @@ static void qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last, int q
// Delete the empty line which is now at the end
(void)ml_delete(lnum + 1, false);
}
qfga_clear();
}
// Correct cursor position.
@ -7214,6 +7237,19 @@ void ex_helpgrep(exarg_T *eap)
}
}
#if defined(EXITFREE)
void free_quickfix(void)
{
qf_free_all(NULL);
// Free all location lists
FOR_ALL_TAB_WINDOWS(tab, win) {
qf_free_all(win);
}
ga_clear(&qfga);
}
#endif
static void get_qf_loc_list(int is_qf, win_T *wp, typval_T *what_arg, typval_T *rettv)
{
if (what_arg->v_type == VAR_UNKNOWN) {

60
src/nvim/testdir/test_quickfix.vim
View File

@ -6220,6 +6220,66 @@ func Test_loclist_replace_autocmd()
call setloclist(0, [], 'f')
endfunc
" Test for a very long error line and a very long information line
func Test_very_long_error_line()
let msg = repeat('abcdefghijklmn', 146)
let emsg = 'Xlonglines.c:1:' . msg
call writefile([msg, emsg], 'Xerror', 'D')
cfile Xerror
cwindow
call assert_equal($'|| {msg}', getline(1))
call assert_equal($'Xlonglines.c|1| {msg}', getline(2))
cclose
let l = execute('clist!')->split("\n")
call assert_equal([$' 1: {msg}', $' 2 Xlonglines.c:1: {msg}'], l)
let l = execute('cc')->split("\n")
call assert_equal([$'(2 of 2): {msg}'], l)
call setqflist([], 'f')
endfunc
" The test depends on deferred delete and string interpolation, which haven't
" been ported, so override it with a rewrite that doesn't use these features.
func! Test_very_long_error_line()
let msg = repeat('abcdefghijklmn', 146)
let emsg = 'Xlonglines.c:1:' . msg
call writefile([msg, emsg], 'Xerror')
cfile Xerror
call delete('Xerror')
cwindow
call assert_equal('|| ' .. msg, getline(1))
call assert_equal('Xlonglines.c|1| ' .. msg, getline(2))
cclose
let l = execute('clist!')->split("\n")
call assert_equal([' 1: ' .. msg, ' 2 Xlonglines.c:1: ' .. msg], l)
let l = execute('cc')->split("\n")
call assert_equal(['(2 of 2): ' .. msg], l)
call setqflist([], 'f')
endfunc
" In the quickfix window, spaces at the beginning of an informational line
" should not be removed but should be removed from an error line.
func Test_info_line_with_space()
cexpr ["a.c:20:12: error: expected ';' before ':' token",
\ ' 20 | Afunc():', '', ' | ^']
copen
call assert_equal(["a.c|20 col 12| error: expected ';' before ':' token",
\ '|| 20 | Afunc():', '|| ',
\ '|| | ^'], getline(1, '$'))
cclose
let l = execute('clist!')->split("\n")
call assert_equal([" 1 a.c:20 col 12: error: expected ';' before ':' token",
\ ' 2: 20 | Afunc():', ' 3: ', ' 4: | ^'], l)
call setqflist([], 'f')
endfunc
func s:QfTf(_)
endfunc