Mercurial > vim
view src/json_test.c @ 34416:0a458b49e1e6 v9.1.0131
patch 9.1.0131: buffer-completion may not always find all matches
Commit: https://github.com/vim/vim/commit/0dc0bff000fd804c6b0778ccc4554a4e4c82c8c9
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Feb 24 14:12:13 2024 +0100
patch 9.1.0131: buffer-completion may not always find all matches
Problem: buffer-completion code too complicated and does not always
find all matches (irisjae)
Solution: do not try to anchor pattern to beginning of line or
directory-separator, always return all matches
Note: we are considering the non-fuzzy buffer-matching here.
Currently, the buffer-completion code makes 2 attempts to match a
pattern against the list of available patterns. First try is to match
the pattern and anchor it to either the beginning of the file name or
at a directory-separator (// or \\).
When a match is found, Vim returns the matching buffers and does not try
to find a match anywhere within a buffer name. So if you have opened two
buffers like /tmp/Foobar.c and /tmp/MyFoobar.c using `:b Foo` will only
complete to the first filename, but not the second (the same happens
with `getcompletion('Foo', 'buffer')`).
It may make sense, that completion priorities buffer names at directory
boundaries, but it inconsistent, may cause confusion why a certain
buffer name is not completed when typing `:b Foo<C-D>` which returns
only a single file name and then pressing Enter (to switch to that
buffer), Vim will error with 'E93: More than one match for Foo').
Similar things may happen when wiping the /tmp/Foobar.c pattern and
afterwards the completion starts completing other buffers.
So let's simplify the code and always match the pattern anywhere in the
buffer name, do not try to favor matches at directory boundaries. This
is also simplifies the code a bit, we do not need to run over the list
of buffers several times, but only twice.
fixes #13894
closes: #14082
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 24 Feb 2024 14:30:03 +0100 |
| parents | f41b55f9357c |
| children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. * See README.txt for an overview of the Vim source code. */ /* * json_test.c: Unittests for json.c */ #undef NDEBUG #include <assert.h> // Must include main.c because it contains much more than just main() #define NO_VIM_MAIN #include "main.c" // This file has to be included because the tested functions are static #include "json.c" #if defined(FEAT_EVAL) /* * Test json_find_end() with incomplete items. */ static void test_decode_find_end(void) { js_read_T reader; reader.js_fill = NULL; reader.js_used = 0; // string and incomplete string reader.js_buf = (char_u *)"\"hello\""; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" \"hello\" "; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"\"hello"; assert(json_find_end(&reader, 0) == MAYBE); // number and dash (incomplete number) reader.js_buf = (char_u *)"123"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"-"; assert(json_find_end(&reader, 0) == MAYBE); // false, true and null, also incomplete reader.js_buf = (char_u *)"false"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"f"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"fa"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"fal"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"fals"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"true"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"t"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"tr"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"tru"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"null"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"n"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"nu"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"nul"; assert(json_find_end(&reader, 0) == MAYBE); // object without white space reader.js_buf = (char_u *)"{\"a\":123}"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"{\"a\":123"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\"a\":"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\"a\""; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\"a"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\""; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{"; assert(json_find_end(&reader, 0) == MAYBE); // object with white space reader.js_buf = (char_u *)" { \"a\" : 123 } "; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" { \"a\" : 123 "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { \"a\" : "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { \"a\" "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { \"a "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { "; assert(json_find_end(&reader, 0) == MAYBE); // JS object with white space reader.js_buf = (char_u *)" { a : 123 } "; assert(json_find_end(&reader, JSON_JS) == OK); reader.js_buf = (char_u *)" { a : "; assert(json_find_end(&reader, JSON_JS) == MAYBE); // array without white space reader.js_buf = (char_u *)"[\"a\",123]"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"[\"a\",123"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\"a\","; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\"a\""; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\"a"; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\""; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"["; assert(json_find_end(&reader, 0) == MAYBE); // array with white space reader.js_buf = (char_u *)" [ \"a\" , 123 ] "; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a\" , 123 "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ \"a\" , "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ \"a\" "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ \"a "; assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ "; assert(json_find_end(&reader, 0) == MAYBE); } static int fill_from_cookie(js_read_T *reader) { reader->js_buf = reader->js_cookie; return TRUE; } /* * Test json_find_end with an incomplete array, calling the fill function. */ static void test_fill_called_on_find_end(void) { js_read_T reader; reader.js_fill = fill_from_cookie; reader.js_used = 0; reader.js_buf = (char_u *)" [ \"a\" , 123 "; reader.js_cookie = " [ \"a\" , 123 ] "; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a\" , "; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a\" "; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a"; assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ "; assert(json_find_end(&reader, 0) == OK); } /* * Test json_find_end with an incomplete string, calling the fill function. */ static void test_fill_called_on_string(void) { js_read_T reader; reader.js_fill = fill_from_cookie; reader.js_used = 0; reader.js_buf = (char_u *)" \"foo"; reader.js_end = reader.js_buf + STRLEN(reader.js_buf); reader.js_cookie = " \"foobar\" "; assert(json_decode_string(&reader, NULL, '"') == OK); } #endif int main(void) { #if defined(FEAT_EVAL) test_decode_find_end(); test_fill_called_on_find_end(); test_fill_called_on_string(); #endif return 0; }