diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/nvim/generators/gen_api_dispatch.lua | 2 | ||||
| -rw-r--r-- | src/nvim/lua/vim.lua | 3 | ||||
| -rw-r--r-- | src/nvim/syntax.c | 5 | ||||
| -rwxr-xr-x | src/nvim/testdir/runnvim.sh | 4 | ||||
| -rw-r--r-- | src/nvim/ui_compositor.c | 3 |
6 files changed, 14 insertions, 7 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 9b6e9fe13e..8ec087c626 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -617,14 +617,14 @@ if(CLANG_ASAN_UBSAN) message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.") check_c_compiler_flag(-fno-sanitize-recover=all SANITIZE_RECOVER_ALL) if(SANITIZE_RECOVER_ALL) - if(TRAVIS_CI_BUILD) + if(CI_BUILD) # Try to recover from all sanitize issues so we get reports about all failures set(SANITIZE_RECOVER -fsanitize-recover=all) # Clang 3.6+ else() set(SANITIZE_RECOVER -fno-sanitize-recover=all) # Clang 3.6+ endif() else() - if(TRAVIS_CI_BUILD) + if(CI_BUILD) # Try to recover from all sanitize issues so we get reports about all failures set(SANITIZE_RECOVER -fsanitize-recover) # Clang 3.5- else() diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua index 6e80ad0e5c..b31209e8ff 100644 --- a/src/nvim/generators/gen_api_dispatch.lua +++ b/src/nvim/generators/gen_api_dispatch.lua @@ -250,7 +250,7 @@ for i = 1, #functions do end output:write('\n } else {') output:write('\n api_set_error(error, kErrorTypeException, \ - "Wrong type for argument '..j..', expecting '..param[1]..'");') + "Wrong type for argument '..j..' when calling '..fn.name..', expecting '..param[1]..'");') output:write('\n goto cleanup;') output:write('\n }\n') else diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua index 0580fcacae..2c7ab46ffe 100644 --- a/src/nvim/lua/vim.lua +++ b/src/nvim/lua/vim.lua @@ -272,6 +272,9 @@ local function __index(t, key) elseif key == 'highlight' then t.highlight = require('vim.highlight') return t.highlight + elseif key == 'F' then + t.F = require('vim.F') + return t.F end end diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 2f8b2989f5..2e593e39de 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -4292,8 +4292,9 @@ static void syn_cmd_include(exarg_T *eap, int syncing) current_syn_inc_tag = ++running_syn_inc_tag; prev_toplvl_grp = curwin->w_s->b_syn_topgrp; curwin->w_s->b_syn_topgrp = sgl_id; - if (source ? do_source(eap->arg, false, DOSO_NONE) == FAIL - : source_in_path(p_rtp, eap->arg, DIP_ALL) == FAIL) { + if (source + ? do_source(eap->arg, false, DOSO_NONE) == FAIL + : source_in_path(p_rtp, eap->arg, DIP_ALL) == FAIL) { EMSG2(_(e_notopen), eap->arg); } curwin->w_s->b_syn_topgrp = prev_toplvl_grp; diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh index 72f9254635..25cb8437b4 100755 --- a/src/nvim/testdir/runnvim.sh +++ b/src/nvim/testdir/runnvim.sh @@ -66,7 +66,7 @@ main() {( fi fi if test "$FAILED" = 1 ; then - travis_fold start "$NVIM_TEST_CURRENT_SUITE/$test_name" + ci_fold start "$NVIM_TEST_CURRENT_SUITE/$test_name" fi valgrind_check . if test -n "$LOG_DIR" ; then @@ -78,7 +78,7 @@ main() {( fi rm -f "$tlog" if test "$FAILED" = 1 ; then - travis_fold end "$NVIM_TEST_CURRENT_SUITE/$test_name" + ci_fold end "$NVIM_TEST_CURRENT_SUITE/$test_name" fi if test "$FAILED" = 1 ; then echo "Test $test_name failed, see output above and summary for more details" >> test.log diff --git a/src/nvim/ui_compositor.c b/src/nvim/ui_compositor.c index 325ad31eaf..9d3ec21949 100644 --- a/src/nvim/ui_compositor.c +++ b/src/nvim/ui_compositor.c @@ -312,6 +312,9 @@ ScreenGrid *ui_comp_mouse_focus(int row, int col) static void compose_line(Integer row, Integer startcol, Integer endcol, LineFlags flags) { + // If rightleft is set, startcol may be -1. In such cases, the assertions + // will fail because no overlap is found. Adjust startcol to prevent it. + startcol = MAX(startcol, 0); // in case we start on the right half of a double-width char, we need to // check the left half. But skip it in output if it wasn't doublewidth. int skipstart = 0, skipend = 0; |