mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 01:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19971 from dundargoc/refactor/remove-casts

Browse Source 
refactor: remove redundant casts
This commit is contained in:
bfredl
2022-08-29 13:23:43 +02:00
committed by GitHub
parent 5fe6bde296 20305494f8
commit e6af1cf250
6 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/decoration.c
View File

@@ -547,7 +547,7 @@ int decor_virt_lines(win_T *wp, linenr_T lnum, VirtLines *lines)
}
int virt_lines = 0;
int row = (int)MAX(lnum - 2, 0);
int row = MAX(lnum - 2, 0);
int end_row = (int)lnum;
MarkTreeIter itr[1] = { 0 };
marktree_itr_get(buf->b_marktree, row, 0, itr);
@@ -558,7 +558,7 @@ int decor_virt_lines(win_T *wp, linenr_T lnum, VirtLines *lines)
} else if (marktree_decor_level(mark) < kDecorLevelVirtLine) {
goto next_mark;
}
bool above = mark.pos.row > (int)(lnum - 2);
bool above = mark.pos.row > (lnum - 2);
Decoration *decor = mark.decor_full;
if (decor && decor->virt_lines_above == above) {
virt_lines += (int)kv_size(decor->virt_lines);

2
src/nvim/ex_docmd.c
View File

@@ -3088,7 +3088,7 @@ cmdidx_T excmd_get_cmdidx(const char *cmd, size_t len)
{
cmdidx_T idx;
for (idx = (cmdidx_T)0; (int)idx < (int)CMD_SIZE; idx = (cmdidx_T)((int)idx + 1)) {
for (idx = (cmdidx_T)0; (int)idx < CMD_SIZE; idx = (cmdidx_T)((int)idx + 1)) {
if (strncmp(cmdnames[(int)idx].cmd_name, cmd, len) == 0) {
break;
}

4
src/nvim/extmark.c
View File

@@ -510,11 +510,11 @@ void extmark_adjust(buf_T *buf, linenr_T line1, linenr_T line2, linenr_T amount,
bcount_t old_byte = 0, new_byte = 0;
int old_row, new_row;
if (amount == MAXLNUM) {
old_row = (int)(line2 - line1 + 1);
old_row = line2 - line1 + 1;
// TODO(bfredl): ej kasta?
old_byte = (bcount_t)buf->deleted_bytes2;
new_row = (int)(amount_after + old_row);
new_row = amount_after + old_row;
} else {
// A region is either deleted (amount == MAXLNUM) or
// added (line2 == MAXLNUM). The only other case is :move

4
src/nvim/highlight.c
View File

@@ -223,7 +223,7 @@ int ns_get_hl(NS *ns_hl, int hl_id, bool link, bool nodefault)
}
}
it.attr_id = fallback ? -1 : hl_get_syn_attr((int)ns_id, hl_id, attrs);
it.attr_id = fallback ? -1 : hl_get_syn_attr(ns_id, hl_id, attrs);
it.version = p->hl_valid - tmp;
it.is_default = attrs.rgb_ae_attr & HL_DEFAULT;
it.link_global = attrs.rgb_ae_attr & HL_GLOBAL;
@@ -406,7 +406,7 @@ void update_ns_hl(int ns_id)
}
int *hl_attrs = **alloc;
for (int hlf = 0; hlf < (int)HLF_COUNT; hlf++) {
for (int hlf = 0; hlf < HLF_COUNT; hlf++) {
int id = syn_check_group(hlf_names[hlf], STRLEN(hlf_names[hlf]));
bool optional = (hlf == HLF_INACTIVE || hlf == HLF_NFLOAT);
hl_attrs[hlf] = hl_get_ui_attr(ns_id, hlf, id, optional);

136
src/nvim/keycodes.c
View File

@@ -57,15 +57,15 @@ static char_u modifier_keys_table[] =
MOD_MASK_SHIFT, '*', '4', 'k', 'D', // delete char
MOD_MASK_SHIFT, '*', '5', 'k', 'L', // delete line
MOD_MASK_SHIFT, '*', '7', '@', '7', // end
MOD_MASK_CTRL, KS_EXTRA, (int)KE_C_END, '@', '7', // end
MOD_MASK_CTRL, KS_EXTRA, KE_C_END, '@', '7', // end
MOD_MASK_SHIFT, '*', '9', '@', '9', // exit
MOD_MASK_SHIFT, '*', '0', '@', '0', // find
MOD_MASK_SHIFT, '#', '1', '%', '1', // help
MOD_MASK_SHIFT, '#', '2', 'k', 'h', // home
MOD_MASK_CTRL, KS_EXTRA, (int)KE_C_HOME, 'k', 'h', // home
MOD_MASK_CTRL, KS_EXTRA, KE_C_HOME, 'k', 'h', // home
MOD_MASK_SHIFT, '#', '3', 'k', 'I', // insert
MOD_MASK_SHIFT, '#', '4', 'k', 'l', // left arrow
MOD_MASK_CTRL, KS_EXTRA, (int)KE_C_LEFT, 'k', 'l', // left arrow
MOD_MASK_CTRL, KS_EXTRA, KE_C_LEFT, 'k', 'l', // left arrow
MOD_MASK_SHIFT, '%', 'a', '%', '3', // message
MOD_MASK_SHIFT, '%', 'b', '%', '4', // move
MOD_MASK_SHIFT, '%', 'c', '%', '5', // next
@@ -75,63 +75,63 @@ static char_u modifier_keys_table[] =
MOD_MASK_SHIFT, '%', 'g', '%', '0', // redo
MOD_MASK_SHIFT, '%', 'h', '&', '3', // replace
MOD_MASK_SHIFT, '%', 'i', 'k', 'r', // right arr.
MOD_MASK_CTRL, KS_EXTRA, (int)KE_C_RIGHT, 'k', 'r', // right arr.
MOD_MASK_CTRL, KS_EXTRA, KE_C_RIGHT, 'k', 'r', // right arr.
MOD_MASK_SHIFT, '%', 'j', '&', '5', // resume
MOD_MASK_SHIFT, '!', '1', '&', '6', // save
MOD_MASK_SHIFT, '!', '2', '&', '7', // suspend
MOD_MASK_SHIFT, '!', '3', '&', '8', // undo
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_UP, 'k', 'u', // up arrow
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_DOWN, 'k', 'd', // down arrow
MOD_MASK_SHIFT, KS_EXTRA, KE_S_UP, 'k', 'u', // up arrow
MOD_MASK_SHIFT, KS_EXTRA, KE_S_DOWN, 'k', 'd', // down arrow
// vt100 F1
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_XF1, KS_EXTRA, (int)KE_XF1,
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_XF2, KS_EXTRA, (int)KE_XF2,
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_XF3, KS_EXTRA, (int)KE_XF3,
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_XF4, KS_EXTRA, (int)KE_XF4,
MOD_MASK_SHIFT, KS_EXTRA, KE_S_XF1, KS_EXTRA, KE_XF1,
MOD_MASK_SHIFT, KS_EXTRA, KE_S_XF2, KS_EXTRA, KE_XF2,
MOD_MASK_SHIFT, KS_EXTRA, KE_S_XF3, KS_EXTRA, KE_XF3,
MOD_MASK_SHIFT, KS_EXTRA, KE_S_XF4, KS_EXTRA, KE_XF4,
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F1, 'k', '1', // F1
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F2, 'k', '2',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F3, 'k', '3',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F4, 'k', '4',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F5, 'k', '5',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F6, 'k', '6',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F7, 'k', '7',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F8, 'k', '8',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F9, 'k', '9',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F10, 'k', ';', // F10
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F1, 'k', '1', // F1
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F2, 'k', '2',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F3, 'k', '3',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F4, 'k', '4',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F5, 'k', '5',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F6, 'k', '6',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F7, 'k', '7',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F8, 'k', '8',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F9, 'k', '9',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F10, 'k', ';', // F10
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F11, 'F', '1',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F12, 'F', '2',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F13, 'F', '3',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F14, 'F', '4',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F15, 'F', '5',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F16, 'F', '6',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F17, 'F', '7',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F18, 'F', '8',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F19, 'F', '9',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F20, 'F', 'A',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F11, 'F', '1',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F12, 'F', '2',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F13, 'F', '3',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F14, 'F', '4',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F15, 'F', '5',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F16, 'F', '6',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F17, 'F', '7',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F18, 'F', '8',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F19, 'F', '9',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F20, 'F', 'A',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F21, 'F', 'B',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F22, 'F', 'C',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F23, 'F', 'D',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F24, 'F', 'E',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F25, 'F', 'F',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F26, 'F', 'G',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F27, 'F', 'H',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F28, 'F', 'I',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F29, 'F', 'J',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F30, 'F', 'K',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F21, 'F', 'B',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F22, 'F', 'C',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F23, 'F', 'D',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F24, 'F', 'E',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F25, 'F', 'F',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F26, 'F', 'G',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F27, 'F', 'H',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F28, 'F', 'I',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F29, 'F', 'J',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F30, 'F', 'K',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F31, 'F', 'L',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F32, 'F', 'M',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F33, 'F', 'N',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F34, 'F', 'O',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F35, 'F', 'P',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F36, 'F', 'Q',
MOD_MASK_SHIFT, KS_EXTRA, (int)KE_S_F37, 'F', 'R',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F31, 'F', 'L',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F32, 'F', 'M',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F33, 'F', 'N',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F34, 'F', 'O',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F35, 'F', 'P',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F36, 'F', 'Q',
MOD_MASK_SHIFT, KS_EXTRA, KE_S_F37, 'F', 'R',
// TAB pseudo code
MOD_MASK_SHIFT, 'k', 'B', KS_EXTRA, (int)KE_TAB,
MOD_MASK_SHIFT, 'k', 'B', KS_EXTRA, KE_TAB,
NUL
};
@@ -349,26 +349,26 @@ static struct mousetable {
bool is_drag; // Is it a mouse drag event?
} mouse_table[] =
{
{ (int)KE_LEFTMOUSE, MOUSE_LEFT, true, false },
{ (int)KE_LEFTDRAG, MOUSE_LEFT, false, true },
{ (int)KE_LEFTRELEASE, MOUSE_LEFT, false, false },
{ (int)KE_MIDDLEMOUSE, MOUSE_MIDDLE, true, false },
{ (int)KE_MIDDLEDRAG, MOUSE_MIDDLE, false, true },
{ (int)KE_MIDDLERELEASE, MOUSE_MIDDLE, false, false },
{ (int)KE_RIGHTMOUSE, MOUSE_RIGHT, true, false },
{ (int)KE_RIGHTDRAG, MOUSE_RIGHT, false, true },
{ (int)KE_RIGHTRELEASE, MOUSE_RIGHT, false, false },
{ (int)KE_X1MOUSE, MOUSE_X1, true, false },
{ (int)KE_X1DRAG, MOUSE_X1, false, true },
{ (int)KE_X1RELEASE, MOUSE_X1, false, false },
{ (int)KE_X2MOUSE, MOUSE_X2, true, false },
{ (int)KE_X2DRAG, MOUSE_X2, false, true },
{ (int)KE_X2RELEASE, MOUSE_X2, false, false },
{ KE_LEFTMOUSE, MOUSE_LEFT, true, false },
{ KE_LEFTDRAG, MOUSE_LEFT, false, true },
{ KE_LEFTRELEASE, MOUSE_LEFT, false, false },
{ KE_MIDDLEMOUSE, MOUSE_MIDDLE, true, false },
{ KE_MIDDLEDRAG, MOUSE_MIDDLE, false, true },
{ KE_MIDDLERELEASE, MOUSE_MIDDLE, false, false },
{ KE_RIGHTMOUSE, MOUSE_RIGHT, true, false },
{ KE_RIGHTDRAG, MOUSE_RIGHT, false, true },
{ KE_RIGHTRELEASE, MOUSE_RIGHT, false, false },
{ KE_X1MOUSE, MOUSE_X1, true, false },
{ KE_X1DRAG, MOUSE_X1, false, true },
{ KE_X1RELEASE, MOUSE_X1, false, false },
{ KE_X2MOUSE, MOUSE_X2, true, false },
{ KE_X2DRAG, MOUSE_X2, false, true },
{ KE_X2RELEASE, MOUSE_X2, false, false },
// DRAG without CLICK
{ (int)KE_MOUSEMOVE, MOUSE_RELEASE, false, true },
{ KE_MOUSEMOVE, MOUSE_RELEASE, false, true },
// RELEASE without CLICK
{ (int)KE_IGNORE, MOUSE_RELEASE, false, false },
{ 0, 0, 0, 0 },
{ KE_IGNORE, MOUSE_RELEASE, false, false },
{ 0, 0, 0, 0 },
};
/// Return the modifier mask bit (#MOD_MASK_*) corresponding to mod name
@@ -926,8 +926,8 @@ char *replace_termcodes(const char *const from, const size_t from_len, char **co
} else {
src += 5;
result[dlen++] = K_SPECIAL;
result[dlen++] = (int)KS_EXTRA;
result[dlen++] = (int)KE_SNR;
result[dlen++] = KS_EXTRA;
result[dlen++] = KE_SNR;
snprintf((char *)result + dlen, buf_len - dlen, "%" PRId64,
(int64_t)current_sctx.sc_sid);
dlen += STRLEN(result + dlen);

4
src/nvim/mouse.c
View File

@@ -704,8 +704,8 @@ static linenr_T find_longest_lnum(void)
max = len;
ret = lnum;
} else if (len == (colnr_T)max
&& abs((int)(lnum - curwin->w_cursor.lnum))
< abs((int)(ret - curwin->w_cursor.lnum))) {
&& abs(lnum - curwin->w_cursor.lnum)
< abs(ret - curwin->w_cursor.lnum)) {
ret = lnum;
}
}