diff options
| author | dundargoc <gocdundar@gmail.com> | 2023-11-16 10:59:11 +0100 |
|---|---|---|
| committer | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-11-20 19:57:09 +0100 |
| commit | a6e3d93421ba13c407a96fac9cc01fa41ec7ad98 (patch) | |
| tree | e84209969b11fe2f0dabcad00a271468b2199bc9 /src/nvim/mark.c | |
| parent | ec79ff893d5906e1f0d90953cffa535ffae47823 (diff) | |
| download | rneovim-a6e3d93421ba13c407a96fac9cc01fa41ec7ad98.tar.gz rneovim-a6e3d93421ba13c407a96fac9cc01fa41ec7ad98.tar.bz2 rneovim-a6e3d93421ba13c407a96fac9cc01fa41ec7ad98.zip | |
refactor: enable formatting for ternaries
This requires removing the "Inner expression should be aligned" rule
from clint as it prevents essentially any formatting regarding ternary
operators.
Diffstat (limited to 'src/nvim/mark.c')
| -rw-r--r-- | src/nvim/mark.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 37e7b830cb..bdd1947d73 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -933,8 +933,8 @@ void ex_delmarks(exarg_T *eap) from = (uint8_t)(*p); to = (uint8_t)p[2]; if (!(lower ? ASCII_ISLOWER(p[2]) - : (digit ? ascii_isdigit(p[2]) - : ASCII_ISUPPER(p[2]))) + : (digit ? ascii_isdigit(p[2]) + : ASCII_ISUPPER(p[2]))) || to < from) { semsg(_(e_invarg2), p); return; @@ -1516,9 +1516,9 @@ const void *mark_global_iter(const void *const iter, char *const name, xfmark_T return NULL; } size_t iter_off = (size_t)(iter_mark - &(namedfm[0])); - *name = (char)(iter_off < NMARKS ? - 'A' + (char)iter_off : - '0' + (char)(iter_off - NMARKS)); + *name = (char)(iter_off < NMARKS + ? 'A' + (char)iter_off + : '0' + (char)(iter_off - NMARKS)); *fm = *iter_mark; while ((size_t)(++iter_mark - &(namedfm[0])) < ARRAY_SIZE(namedfm)) { if (iter_mark->fmark.mark.lnum) { @@ -1580,11 +1580,15 @@ const void *mark_buffer_iter(const void *const iter, const buf_T *const buf, cha FUNC_ATTR_NONNULL_ARG(2, 3, 4) FUNC_ATTR_WARN_UNUSED_RESULT { *name = NUL; - char mark_name = (char)(iter == NULL ? NUL : - iter == &(buf->b_last_cursor) ? '"' : - iter == &(buf->b_last_insert) ? '^' : - iter == &(buf->b_last_change) ? '.' : - 'a' + (char)((const fmark_T *)iter - &(buf->b_namedm[0]))); + char mark_name = (char)(iter == NULL + ? NUL + : (iter == &(buf->b_last_cursor) + ? '"' + : (iter == &(buf->b_last_insert) + ? '^' + : (iter == &(buf->b_last_change) + ? '.' + : 'a' + (const fmark_T *)iter - &(buf->b_namedm[0]))))); const fmark_T *iter_mark = next_buffer_mark(buf, &mark_name); while (iter_mark != NULL && iter_mark->mark.lnum == 0) { iter_mark = next_buffer_mark(buf, &mark_name); |