diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-08-23 04:13:29 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-08-23 10:00:53 -0400 |
| commit | 6c8851be4e5ce8cbd6f224451fae8a0adc292bf6 (patch) | |
| tree | fb3644fcd5566cac85a186513e0ba451505c1f36 /src/nvim/edit.c | |
| parent | 27fbffeb4f56a76a24a8d8b348caf6f733f2fc4d (diff) | |
| download | rneovim-6c8851be4e5ce8cbd6f224451fae8a0adc292bf6.tar.gz rneovim-6c8851be4e5ce8cbd6f224451fae8a0adc292bf6.tar.bz2 rneovim-6c8851be4e5ce8cbd6f224451fae8a0adc292bf6.zip | |
lint
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index be2797ee3e..08b74249ba 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -6919,7 +6919,7 @@ bool in_cinkeys(int keytyped, int when, bool line_is_empty) p = look + STRLEN(look); if ((try_match || try_match_word) && curwin->w_cursor.col >= (colnr_T)(p - look)) { - int match = FALSE; + bool match = false; if (keytyped == KEY_COMPLETE) { char_u *s; @@ -6944,28 +6944,30 @@ bool in_cinkeys(int keytyped, int when, bool line_is_empty) && (icase ? mb_strnicmp(s, look, (size_t)(p - look)) : STRNCMP(s, look, p - look)) == 0) - match = TRUE; - } else - /* TODO: multi-byte */ - if (keytyped == (int)p[-1] || (icase && keytyped < 256 - && TOLOWER_LOC(keytyped) == - TOLOWER_LOC((int)p[-1]))) { - line = get_cursor_pos_ptr(); - assert(p >= look && (uintmax_t)(p - look) <= SIZE_MAX); - if ((curwin->w_cursor.col == (colnr_T)(p - look) - || !vim_iswordc(line[-(p - look) - 1])) - && (icase - ? mb_strnicmp(line - (p - look), look, (size_t)(p - look)) - : STRNCMP(line - (p - look), look, p - look)) - == 0) - match = TRUE; + match = true; + } else { + // TODO(@brammool): multi-byte + if (keytyped == (int)p[-1] + || (icase && keytyped < 256 + && TOLOWER_LOC(keytyped) == TOLOWER_LOC((int)p[-1]))) { + line = get_cursor_pos_ptr(); + assert(p >= look && (uintmax_t)(p - look) <= SIZE_MAX); + if ((curwin->w_cursor.col == (colnr_T)(p - look) + || !vim_iswordc(line[-(p - look) - 1])) + && (icase + ? mb_strnicmp(line - (p - look), look, (size_t)(p - look)) + : STRNCMP(line - (p - look), look, p - look)) == 0) { + match = true; + } + } } if (match && try_match_word && !try_match) { /* "0=word": Check if there are only blanks before the * word. */ if (getwhitecols(line) != - (int)(curwin->w_cursor.col - (p - look))) - match = FALSE; + (int)(curwin->w_cursor.col - (p - look))) { + match = false; + } } if (match) { return true; |