Mercurial > vim
view src/json_test.c @ 34485:157cf882799f v9.1.0150
patch 9.1.0150: Several minor 'winfixbuf' issues
Commit: https://github.com/vim/vim/commit/4bb505e28cac0389561fff78d8bbe0319c2bcf2f
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 5 20:39:07 2024 +0100
patch 9.1.0150: Several minor 'winfixbuf' issues
Problem: several minor 'winfixbuf' issues exist, mostly relating to the
quickfix list
Solution: address them and adjust tests. Retab and reflow a few things too.
(Sean Dewar)
Things touched include:
- Replace the semsgs with gettext'd emsgs.
- Handle window switching in ex_listdo properly, so curbuf and curwin
are kept in-sync and trigger autocommands; handle those properly.
- Don't change the list entry index in qf_jump_edit_buffer if we fail
due to 'wfb' (achieved by returning FAIL; QF_ABORT should only be used
if the list was changed).
- Make qf_jump_edit_buffer actually switch to prevwin when using `:cXX`
commands **outside** of the list window if 'wfb' is set in curwin.
Handle autocommands properly in case they mess with the list.
NOTE: previously, it seemed to split if 'wfb' was set, but do nothing
and fail if prevwin is *valid*. This behaviour seemed strange, and maybe
unintentional? Now it aligns more with what's described for the `:cXX`
commands in the original PR description when used outside a list window,
I think.
- In both functions, only consider prevwin if 'wfb' isn't set for it;
fallback to splitting otherwise.
- Use win_split to split. Not sure if there was a specific reason for
using ex_splitview. win_split is simpler and respects modifiers like
:vertical that may have been used. Plus, its return value can be checked
for setting opened_window in qf code (technically win_split_ins autocmds
could immediately close it or change windows, in which the qf code might
close some other window on failure; it's already the case elsewhere,
though).
closes: #14142
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 05 Mar 2024 20:45:04 +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; }