kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove redundant NOLINT comments

Browse Source
This commit is contained in:
dundargoc 2024-01-01 15:56:00 +01:00 committed by dundargoc
parent f69658bc35
commit b49d4e18a6
19 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/assert_defs.h
View File

@ -61,7 +61,7 @@
# define STATIC_ASSERT_STATEMENT(cond, msg) _Static_assert(cond, msg)
// if we're dealing with gcc >= 4.6 in C99 mode, we can still use
// _Static_assert but we need to suppress warnings, this is pretty ugly.
#elif (!defined(__clang__) && !defined(__INTEL_COMPILER)) && /* NOLINT(whitespace/parens)*/ \
#elif (!defined(__clang__) && !defined(__INTEL_COMPILER)) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
# define STATIC_ASSERT_STATEMENT(cond, msg) _Static_assert(cond, msg)

2
src/nvim/autocmd.h
View File

@ -77,7 +77,7 @@ enum { BUFLOCAL_PAT_LEN = 25, };
/// Iterates over all the events for auto commands
#define FOR_ALL_AUEVENTS(event) \
for (event_T event = (event_T)0; (int)event < (int)NUM_EVENTS; event = (event_T)((int)event + 1)) // NOLINT
for (event_T event = (event_T)0; (int)event < (int)NUM_EVENTS; event = (event_T)((int)event + 1))
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "autocmd.h.generated.h"

4
src/nvim/buffer.c
View File

@ -276,7 +276,7 @@ int open_buffer(bool read_stdin, exarg_T *eap, int flags_arg)
|| (S_ISCHR(perm)
&& is_dev_fd_file(curbuf->b_ffname))
# endif
)) { // NOLINT(whitespace/parens)
)) {
read_fifo = true;
}
if (read_fifo) {
@ -2145,7 +2145,7 @@ buf_T *buflist_findname_exp(char *fname)
#else
false
#endif
); // NOLINT(whitespace/parens)
);
if (ffname != NULL) {
buf = buflist_findname(ffname);
xfree(ffname);

2
src/nvim/cmdexpand.c
View File

@ -3239,7 +3239,7 @@ void globpath(char *path, char *file, garray_T *ga, int expand_options, bool dir
copy_option_part(&path, buf, MAXPATHL, ",");
if (strlen(buf) + strlen(file) + 2 < MAXPATHL) {
add_pathsep(buf);
STRCAT(buf, file); // NOLINT
STRCAT(buf, file);
char **p;
int num_p = 0;

2
src/nvim/eval/typval.h
View File

@ -360,7 +360,7 @@ extern bool tv_in_free_unref_items;
/// @param li Name of the variable with current listitem_T entry.
/// @param code Cycle body.
#define TV_LIST_ITER(l, li, code) \
TV_LIST_ITER_MOD( , l, li, code) // NOLINT(whitespace/parens)
TV_LIST_ITER_MOD( , l, li, code)
/// Iterate over a list
///

2
src/nvim/ex_eval.c
View File

@ -223,7 +223,7 @@ bool cause_errthrow(const char *mesg, bool multiline, bool severe, bool *ignore)
// catch clause; just finally clauses are executed before the script
// is terminated.
return false;
} else // NOLINT(readability/braces)
} else
#endif
{
// Prepare the throw of an error exception, so that everything will

2
src/nvim/file_search.c
View File

@ -308,7 +308,7 @@ void *vim_findfile_init(char *path, char *filename, char *stopdirs, int level, i
goto error_return;
}
path += 2;
} else // NOLINT(readability/braces)
} else
#endif
if (os_dirname(ff_expand_buffer, MAXPATHL) == FAIL) {
goto error_return;

4
src/nvim/globals.h
View File

@ -366,7 +366,7 @@ EXTERN win_T *lastwin; // last window
EXTERN win_T *prevwin INIT( = NULL); // previous window
#define ONE_WINDOW (firstwin == lastwin)
#define FOR_ALL_FRAMES(frp, first_frame) \
for ((frp) = first_frame; (frp) != NULL; (frp) = (frp)->fr_next) // NOLINT
for ((frp) = first_frame; (frp) != NULL; (frp) = (frp)->fr_next)
// When using this macro "break" only breaks out of the inner loop. Use "goto"
// to break out of the tabpage loop.
@ -408,7 +408,7 @@ EXTERN buf_T *curbuf INIT( = NULL); // currently active buffer
for (buf_T *buf = lastbuf; buf != NULL; buf = buf->b_prev)
#define FOR_ALL_BUF_WININFO(buf, wip) \
for ((wip) = (buf)->b_wininfo; (wip) != NULL; (wip) = (wip)->wi_next) // NOLINT
for ((wip) = (buf)->b_wininfo; (wip) != NULL; (wip) = (wip)->wi_next)
// List of files being edited (global argument list). curwin->w_alist points
// to this when the window is using the global argument list.

8
src/nvim/indent_c.c
View File

@ -3105,8 +3105,8 @@ int get_c_indent(void)
} else {
// Found first unterminated line on a row, may
// line up with this line, remember its indent
// 100 + // NOLINT(whitespace/tab)
// -> here; // NOLINT(whitespace/tab)
// 100 +
// -> here;
l = get_cursor_line_ptr();
amount = cur_amount;
@ -3655,7 +3655,7 @@ static int find_match(int lookfor, linenr_T ourscope)
if (cin_iselse(look)) {
mightbeif = cin_skipcomment(look + 4);
if (!cin_isif(mightbeif)) {
elselevel++; // NOLINT(readability/braces)
elselevel++;
}
continue;
}
@ -3670,7 +3670,7 @@ static int find_match(int lookfor, linenr_T ourscope)
// If it's an "if" decrement elselevel
look = cin_skipcomment(get_cursor_line_ptr());
if (cin_isif(look)) {
elselevel--; // NOLINT(readability/braces)
elselevel--;
// When looking for an "if" ignore "while"s that
// get in the way.
if (elselevel == 0 && lookfor == LOOKFOR_IF) {

2
src/nvim/option.c
View File

@ -209,7 +209,7 @@ static void set_init_default_backupskip(void)
p = "/tmp";
# endif
mustfree = false;
} else // NOLINT(readability/braces)
} else
#endif
{
p = vim_getenv(names[n]);

2
src/nvim/os/env.c
View File

@ -619,7 +619,7 @@ void expand_env_esc(char *restrict srcp, char *restrict dst, int dstlen, bool es
while (c-- > 0 && *tail != NUL && *tail != '}') {
*var++ = *tail++;
}
} else // NOLINT
} else
#endif
{
while (c-- > 0 && *tail != NUL && vim_isIDc((uint8_t)(*tail))) {

2
src/nvim/os/pty_conpty_win.h
View File

@ -7,7 +7,7 @@
# define HPCON VOID *
#endif
extern HRESULT(WINAPI *pCreatePseudoConsole) // NOLINT(whitespace/parens)
extern HRESULT(WINAPI *pCreatePseudoConsole)
(COORD, HANDLE, HANDLE, DWORD, HPCON *);
extern HRESULT(WINAPI *pResizePseudoConsole)(HPCON, COORD);
extern void(WINAPI *pClosePseudoConsole)(HPCON);

4
src/nvim/path.c
View File

@ -651,7 +651,7 @@ static size_t do_path_expand(garray_T *gap, const char *path, size_t wildoff, in
&& (vim_strchr("*?[{~$", (uint8_t)(*path_end)) != NULL
|| (!p_fic && (flags & EW_ICASE) && mb_isalpha(utf_ptr2char(path_end))))
#endif
) { // NOLINT(whitespace/parens)
) {
e = p;
}
len = (size_t)(utfc_ptr2len(path_end));
@ -907,7 +907,7 @@ static char *get_path_cutoff(char *fname, garray_T *gap)
#ifdef MSWIN
|| (vim_ispathsep(fname[j]) && vim_ispathsep(path_part[i][j]))
#endif
) // NOLINT(whitespace/parens)
)
&& fname[j] != NUL && path_part[i][j] != NUL) {
j++;
}

2
src/nvim/quickfix.c
View File

@ -272,7 +272,7 @@ enum { QF_WINHEIGHT = 10, }; ///< default height for quickfix window
// Macro to loop through all the items in a quickfix list
// Quickfix item index starts from 1, so i below starts at 1
#define FOR_ALL_QFL_ITEMS(qfl, qfp, i) \
for ((i) = 1, (qfp) = (qfl)->qf_start; /* NOLINT(readability/braces) */ \
for ((i) = 1, (qfp) = (qfl)->qf_start; \
!got_int && (i) <= (qfl)->qf_count && (qfp) != NULL; \
(i)++, (qfp) = (qfp)->qf_next)

16
src/nvim/rbuffer.h
View File

@ -38,31 +38,31 @@
// Note that the rbuffer_{produced,consumed} calls are necessary or these macros
// create infinite loops
#define RBUFFER_UNTIL_EMPTY(buf, rptr, rcnt) \
for (size_t rcnt = 0, _r = 1; _r; _r = 0) /* NOLINT(readability/braces) */ \
for (char *rptr = rbuffer_read_ptr(buf, &rcnt); /* NOLINT(readability/braces) */ \
for (size_t rcnt = 0, _r = 1; _r; _r = 0) \
for (char *rptr = rbuffer_read_ptr(buf, &rcnt); \
buf->size; \
rptr = rbuffer_read_ptr(buf, &rcnt))
#define RBUFFER_UNTIL_FULL(buf, wptr, wcnt) \
for (size_t wcnt = 0, _r = 1; _r; _r = 0) /* NOLINT(readability/braces) */ \
for (char *wptr = rbuffer_write_ptr(buf, &wcnt); /* NOLINT(readability/braces) */ \
for (size_t wcnt = 0, _r = 1; _r; _r = 0) \
for (char *wptr = rbuffer_write_ptr(buf, &wcnt); \
rbuffer_space(buf); \
wptr = rbuffer_write_ptr(buf, &wcnt))
// Iteration
#define RBUFFER_EACH(buf, c, i) \
for (size_t i = 0; /* NOLINT(readability/braces) */ \
for (size_t i = 0; \
i < buf->size; \
i = buf->size) \
for (char c = 0; /* NOLINT(readability/braces) */ \
for (char c = 0; \
i < buf->size ? ((int)(c = *rbuffer_get(buf, i))) || 1 : 0; \
i++)
#define RBUFFER_EACH_REVERSE(buf, c, i) \
for (size_t i = buf->size; /* NOLINT(readability/braces) */ \
for (size_t i = buf->size; \
i != SIZE_MAX; \
i = SIZE_MAX) \
for (char c = 0; /* NOLINT(readability/braces) */ \
for (char c = 0; \
i-- > 0 ? ((int)(c = *rbuffer_get(buf, i))) || 1 : 0; \
)

54
src/nvim/regexp.c
View File

@ -5362,9 +5362,9 @@ static bool reg_save_equal(const regsave_T *save)
// After a failed match restore the sub-expressions.
#define restore_se(savep, posp, pp) { \
if (REG_MULTI) /* NOLINT(readability/braces) */ \
if (REG_MULTI) \
*(posp) = (savep)->se_u.pos; \
else /* NOLINT */ \
else \
*(pp) = (savep)->se_u.ptr; }
// Tentatively set the sub-expression start to the current position (after
@ -8687,9 +8687,9 @@ static void nfa_emit_equi_class(int c)
case 0x1eb2:
case 0x1eb4:
case 0x1eb6:
EMIT2('A') EMIT2(A_grave) EMIT2(A_acute) // NOLINT(whitespace/cast)
EMIT2(A_circumflex) EMIT2(A_virguilla) // NOLINT(whitespace/cast)
EMIT2(A_diaeresis) EMIT2(A_ring) // NOLINT(whitespace/cast)
EMIT2('A') EMIT2(A_grave) EMIT2(A_acute)
EMIT2(A_circumflex) EMIT2(A_virguilla)
EMIT2(A_diaeresis) EMIT2(A_ring)
EMIT2(0x100) EMIT2(0x102) EMIT2(0x104)
EMIT2(0x1cd) EMIT2(0x1de) EMIT2(0x1e0)
EMIT2(0x1fa) EMIT2(0x200) EMIT2(0x202)
@ -8768,8 +8768,8 @@ static void nfa_emit_equi_class(int c)
case 0x1ec2:
case 0x1ec4:
case 0x1ec6:
EMIT2('E') EMIT2(E_grave) EMIT2(E_acute) // NOLINT(whitespace/cast)
EMIT2(E_circumflex) EMIT2(E_diaeresis) // NOLINT(whitespace/cast)
EMIT2('E') EMIT2(E_grave) EMIT2(E_acute)
EMIT2(E_circumflex) EMIT2(E_diaeresis)
EMIT2(0x112) EMIT2(0x114) EMIT2(0x116)
EMIT2(0x118) EMIT2(0x11a) EMIT2(0x204)
EMIT2(0x206) EMIT2(0x228) EMIT2(0x246)
@ -8837,8 +8837,8 @@ static void nfa_emit_equi_class(int c)
case 0x1e2e:
case 0x1ec8:
case 0x1eca:
EMIT2('I') EMIT2(I_grave) EMIT2(I_acute) // NOLINT(whitespace/cast)
EMIT2(I_circumflex) EMIT2(I_diaeresis) // NOLINT(whitespace/cast)
EMIT2('I') EMIT2(I_grave) EMIT2(I_acute)
EMIT2(I_circumflex) EMIT2(I_diaeresis)
EMIT2(0x128) EMIT2(0x12a) EMIT2(0x12c)
EMIT2(0x12e) EMIT2(0x130) EMIT2(0x197)
EMIT2(0x1cf) EMIT2(0x208) EMIT2(0x20a)
@ -8947,9 +8947,9 @@ static void nfa_emit_equi_class(int c)
case 0x1ede:
case 0x1ee0:
case 0x1ee2:
EMIT2('O') EMIT2(O_grave) EMIT2(O_acute) // NOLINT(whitespace/cast)
EMIT2(O_circumflex) EMIT2(O_virguilla) // NOLINT(whitespace/cast)
EMIT2(O_diaeresis) EMIT2(O_slash) // NOLINT(whitespace/cast)
EMIT2('O') EMIT2(O_grave) EMIT2(O_acute)
EMIT2(O_circumflex) EMIT2(O_virguilla)
EMIT2(O_diaeresis) EMIT2(O_slash)
EMIT2(0x14c) EMIT2(0x14e) EMIT2(0x150)
EMIT2(0x19f) EMIT2(0x1a0) EMIT2(0x1d1)
EMIT2(0x1ea) EMIT2(0x1ec) EMIT2(0x1fe)
@ -9064,8 +9064,8 @@ static void nfa_emit_equi_class(int c)
case 0x1eec:
case 0x1eee:
case 0x1ef0:
EMIT2('U') EMIT2(U_grave) EMIT2(U_acute) // NOLINT(whitespace/cast)
EMIT2(U_diaeresis) EMIT2(U_circumflex) // NOLINT(whitespace/cast)
EMIT2('U') EMIT2(U_grave) EMIT2(U_acute)
EMIT2(U_diaeresis) EMIT2(U_circumflex)
EMIT2(0x168) EMIT2(0x16a)
EMIT2(0x16c) EMIT2(0x16e) EMIT2(0x170)
EMIT2(0x172) EMIT2(0x1af) EMIT2(0x1d3)
@ -9168,9 +9168,9 @@ static void nfa_emit_equi_class(int c)
case 0x1eb5:
case 0x1eb7:
case 0x2c65:
EMIT2('a') EMIT2(a_grave) EMIT2(a_acute) // NOLINT(whitespace/cast)
EMIT2(a_circumflex) EMIT2(a_virguilla) // NOLINT(whitespace/cast)
EMIT2(a_diaeresis) EMIT2(a_ring) // NOLINT(whitespace/cast)
EMIT2('a') EMIT2(a_grave) EMIT2(a_acute)
EMIT2(a_circumflex) EMIT2(a_virguilla)
EMIT2(a_diaeresis) EMIT2(a_ring)
EMIT2(0x101) EMIT2(0x103) EMIT2(0x105)
EMIT2(0x1ce) EMIT2(0x1df) EMIT2(0x1e1)
EMIT2(0x1fb) EMIT2(0x201) EMIT2(0x203)
@ -9257,8 +9257,8 @@ static void nfa_emit_equi_class(int c)
case 0x1ec3:
case 0x1ec5:
case 0x1ec7:
EMIT2('e') EMIT2(e_grave) EMIT2(e_acute) // NOLINT(whitespace/cast)
EMIT2(e_circumflex) EMIT2(e_diaeresis) // NOLINT(whitespace/cast)
EMIT2('e') EMIT2(e_grave) EMIT2(e_acute)
EMIT2(e_circumflex) EMIT2(e_diaeresis)
EMIT2(0x113) EMIT2(0x115)
EMIT2(0x117) EMIT2(0x119) EMIT2(0x11b)
EMIT2(0x205) EMIT2(0x207) EMIT2(0x229)
@ -9333,8 +9333,8 @@ static void nfa_emit_equi_class(int c)
case 0x1e2f:
case 0x1ec9:
case 0x1ecb:
EMIT2('i') EMIT2(i_grave) EMIT2(i_acute) // NOLINT(whitespace/cast)
EMIT2(i_circumflex) EMIT2(i_diaeresis) // NOLINT(whitespace/cast)
EMIT2('i') EMIT2(i_grave) EMIT2(i_acute)
EMIT2(i_circumflex) EMIT2(i_diaeresis)
EMIT2(0x129) EMIT2(0x12b) EMIT2(0x12d)
EMIT2(0x12f) EMIT2(0x1d0) EMIT2(0x209)
EMIT2(0x20b) EMIT2(0x268) EMIT2(0x1d96)
@ -9450,9 +9450,9 @@ static void nfa_emit_equi_class(int c)
case 0x1edf:
case 0x1ee1:
case 0x1ee3:
EMIT2('o') EMIT2(o_grave) EMIT2(o_acute) // NOLINT(whitespace/cast)
EMIT2(o_circumflex) EMIT2(o_virguilla) // NOLINT(whitespace/cast)
EMIT2(o_diaeresis) EMIT2(o_slash) // NOLINT(whitespace/cast)
EMIT2('o') EMIT2(o_grave) EMIT2(o_acute)
EMIT2(o_circumflex) EMIT2(o_virguilla)
EMIT2(o_diaeresis) EMIT2(o_slash)
EMIT2(0x14d) EMIT2(0x14f) EMIT2(0x151)
EMIT2(0x1a1) EMIT2(0x1d2) EMIT2(0x1eb)
EMIT2(0x1ed) EMIT2(0x1ff) EMIT2(0x20d)
@ -9581,8 +9581,8 @@ static void nfa_emit_equi_class(int c)
case 0x1eed:
case 0x1eef:
case 0x1ef1:
EMIT2('u') EMIT2(u_grave) EMIT2(u_acute) // NOLINT(whitespace/cast)
EMIT2(u_circumflex) EMIT2(u_diaeresis) // NOLINT(whitespace/cast)
EMIT2('u') EMIT2(u_grave) EMIT2(u_acute)
EMIT2(u_circumflex) EMIT2(u_diaeresis)
EMIT2(0x169) EMIT2(0x16b)
EMIT2(0x16d) EMIT2(0x16f) EMIT2(0x171)
EMIT2(0x173) EMIT2(0x1d6) EMIT2(0x1d8)
@ -9635,7 +9635,7 @@ static void nfa_emit_equi_class(int c)
case 0x1ef5:
case 0x1ef7:
case 0x1ef9:
EMIT2('y') EMIT2(y_acute) EMIT2(y_diaeresis) // NOLINT(whitespace/cast)
EMIT2('y') EMIT2(y_acute) EMIT2(y_diaeresis)
EMIT2(0x177) EMIT2(0x1b4) EMIT2(0x233) EMIT2(0x24f)
EMIT2(0x1e8f) EMIT2(0x1e99) EMIT2(0x1ef3)
EMIT2(0x1ef5) EMIT2(0x1ef7) EMIT2(0x1ef9)

2
src/nvim/runtime.c
View File

@ -1085,7 +1085,7 @@ static int load_pack_plugin(bool opt, char *fname)
size_t len = strlen(ffname) + sizeof(plugpat);
char *pat = xmallocz(len);
vim_snprintf(pat, len, plugpat, ffname); // NOLINT
vim_snprintf(pat, len, plugpat, ffname);
gen_expand_wildcards_and_cb(1, &pat, EW_FILE, true, source_callback_vim_lua, NULL);
char *cmd = xstrdup("g:did_load_filetypes");

4
src/nvim/shada.c
View File

@ -3399,7 +3399,7 @@ static ShaDaReadResult msgpack_read_uint64(ShaDaReadDef *const sd_reader, const
CLEAR_GA_AND_ERROR_OUT(ad_ga); \
}
#define CHECKED_KEY(un, entry_name, name, error_desc, tgt, condition, attr, proc) \
else if (CHECK_KEY((un).data.via.map.ptr[i].key, name)) /* NOLINT(readability/braces) */ \
else if (CHECK_KEY((un).data.via.map.ptr[i].key, name)) \
{ \
CHECKED_ENTRY(condition, \
"has " name " key value " error_desc, \
@ -3430,7 +3430,7 @@ static ShaDaReadResult msgpack_read_uint64(ShaDaReadDef *const sd_reader, const
#define INTEGER_KEY(un, entry_name, name, tgt) \
INT_KEY(un, entry_name, name, tgt, TOINT)
#define ADDITIONAL_KEY(un) \
else { /* NOLINT(readability/braces) */ \
else { \
ga_grow(&ad_ga, 1); \
memcpy(((char *)ad_ga.ga_data) + ((size_t)ad_ga.ga_len \
* sizeof(*(un).data.via.map.ptr)), \

8
src/nvim/spellfile.c
View File

@ -574,7 +574,7 @@ static inline int spell_check_magic_string(FILE *const fd)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_ALWAYS_INLINE
{
char buf[VIMSPELLMAGICL];
SPELL_READ_BYTES(buf, VIMSPELLMAGICL, fd,; ); // NOLINT(whitespace/parens)
SPELL_READ_BYTES(buf, VIMSPELLMAGICL, fd,; );
if (memcmp(buf, VIMSPELLMAGIC, VIMSPELLMAGICL) != 0) {
return SP_FORMERROR;
}
@ -1036,7 +1036,7 @@ static int read_region_section(FILE *fd, slang_T *lp, int len)
if (len > MAXREGIONS * 2) {
return SP_FORMERROR;
}
SPELL_READ_NONNUL_BYTES(lp->sl_regions, (size_t)len, fd,; ); // NOLINT(whitespace/parens)
SPELL_READ_NONNUL_BYTES(lp->sl_regions, (size_t)len, fd,; );
lp->sl_regions[len] = NUL;
return 0;
}
@ -1101,7 +1101,7 @@ static int read_prefcond_section(FILE *fd, slang_T *lp)
if (n > 0) {
char buf[MAXWLEN + 1];
buf[0] = '^'; // always match at one position only
SPELL_READ_NONNUL_BYTES(buf + 1, (size_t)n, fd,; ); // NOLINT(whitespace/parens)
SPELL_READ_NONNUL_BYTES(buf + 1, (size_t)n, fd,; );
buf[n + 1] = NUL;
lp->sl_prefprog[i] = vim_regcomp(buf, RE_MAGIC | RE_STRING);
}
@ -3978,7 +3978,7 @@ static int tree_add_word(spellinfo_T *spin, const char *word, wordnode_T *root,
// (si_compress_cnt == 1) and the number of free nodes drops below the
// maximum word length.
#ifndef SPELL_COMPRESS_ALWAYS
if (spin->si_compress_cnt == 1 // NOLINT(readability/braces)
if (spin->si_compress_cnt == 1
? spin->si_free_count < MAXWLEN
: spin->si_blocks_cnt >= compress_start)
#endif