IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix linter errors.

Browse Source
This commit is contained in:
Jurica Bradaric 2016-01-30 14:42:06 +01:00
parent 7179f43666
commit a984203bd6
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/eval.c
View File

@ -15256,7 +15256,7 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
// match from matchaddpos() // match from matchaddpos()
for (i = 1; i < 9; ++i) { for (i = 1; i < 9; ++i) {
sprintf((char *)buf, (char *)"pos%d", i); snprintf((char *)buf, sizeof(buf), (char *)"pos%d", i);
if ((di = dict_find(d, (char_u *)buf, -1)) != NULL) { if ((di = dict_find(d, (char_u *)buf, -1)) != NULL) {
if (di->di_tv.v_type != VAR_LIST) { if (di->di_tv.v_type != VAR_LIST) {
return; return;
@ -15271,12 +15271,12 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
} }
if (i == 0) { if (i == 0) {
match_add(curwin, get_dict_string(d, (char_u *)"group", FALSE), match_add(curwin, get_dict_string(d, (char_u *)"group", false),
get_dict_string(d, (char_u *)"pattern", FALSE), get_dict_string(d, (char_u *)"pattern", false),
(int)get_dict_number(d, (char_u *)"priority"), (int)get_dict_number(d, (char_u *)"priority"),
(int)get_dict_number(d, (char_u *)"id"), NULL); (int)get_dict_number(d, (char_u *)"id"), NULL);
} else { } else {
match_add(curwin, get_dict_string(d, (char_u *)"group", FALSE), match_add(curwin, get_dict_string(d, (char_u *)"group", false),
NULL, (int)get_dict_number(d, (char_u *)"priority"), NULL, (int)get_dict_number(d, (char_u *)"priority"),
(int)get_dict_number(d, (char_u *)"id"), s); (int)get_dict_number(d, (char_u *)"id"), s);
list_unref(s); list_unref(s);

12
src/nvim/quickfix.c
View File

@ -1607,13 +1607,11 @@ win_found:
if (qf_ptr->qf_col > 0) { if (qf_ptr->qf_col > 0) {
curwin->w_cursor.col = qf_ptr->qf_col - 1; curwin->w_cursor.col = qf_ptr->qf_col - 1;
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
if (qf_ptr->qf_viscol == TRUE) { if (qf_ptr->qf_viscol == true) {
/* // Check each character from the beginning of the error
* Check each character from the beginning of the error // line up to the error column. For each tab character
* line up to the error column. For each tab character // found, reduce the error column value by the length of
* found, reduce the error column value by the length of // a tab character.
* a tab character.
*/
line = get_cursor_line_ptr(); line = get_cursor_line_ptr();
screen_col = 0; screen_col = 0;
for (char_col = 0; char_col < curwin->w_cursor.col; ++char_col) { for (char_col = 0; char_col < curwin->w_cursor.col; ++char_col) {

25
src/nvim/tag.c
View File

@ -499,21 +499,19 @@ do_tag (
EMSG2(_("E426: tag not found: %s"), name); EMSG2(_("E426: tag not found: %s"), name);
g_do_tagpreview = 0; g_do_tagpreview = 0;
} else { } else {
int ask_for_selection = FALSE; bool ask_for_selection = false;
if (type == DT_CSCOPE && num_matches > 1) { if (type == DT_CSCOPE && num_matches > 1) {
cs_print_tags(); cs_print_tags();
ask_for_selection = TRUE; ask_for_selection = true;
} else if (type == DT_TAG) { } else if (type == DT_TAG) {
// If a count is supplied to the ":tag <name>" command, then // If a count is supplied to the ":tag <name>" command, then
// jump to count'th matching tag. // jump to count'th matching tag.
cur_match = count > 0 ? count - 1 : 0; cur_match = count > 0 ? count - 1 : 0;
} else if (type == DT_SELECT || (type == DT_JUMP && num_matches > 1)) { } else if (type == DT_SELECT || (type == DT_JUMP && num_matches > 1)) {
/* // List all the matching tags.
* List all the matching tags. // Assume that the first match indicates how long the tags can
* Assume that the first match indicates how long the tags can // be, and align the file names to that.
* be, and align the file names to that.
*/
parse_match(matches[0], &tagp); parse_match(matches[0], &tagp);
taglen = (int)(tagp.tagname_end - tagp.tagname + 2); taglen = (int)(tagp.tagname_end - tagp.tagname + 2);
if (taglen < 18) if (taglen < 18)
@ -662,9 +660,10 @@ do_tag (
msg_putchar('\n'); msg_putchar('\n');
os_breakcheck(); os_breakcheck();
} }
if (got_int) if (got_int) {
got_int = FALSE; /* only stop the listing */ got_int = false; // only stop the listing
ask_for_selection = TRUE; }
ask_for_selection = true;
} else if (type == DT_LTAG) { } else if (type == DT_LTAG) {
list_T *list; list_T *list;
char_u tag_name[128 + 1]; char_u tag_name[128 + 1];
@ -797,10 +796,8 @@ do_tag (
cur_match = 0; /* Jump to the first tag */ cur_match = 0; /* Jump to the first tag */
} }
if (ask_for_selection == TRUE) { if (ask_for_selection) {
/* // Ask to select a tag from the list.
* Ask to select a tag from the list.
*/
i = prompt_for_number(NULL); i = prompt_for_number(NULL);
if (i <= 0 || i > num_matches || got_int) { if (i <= 0 || i > num_matches || got_int) {
/* no valid choice: don't change anything */ /* no valid choice: don't change anything */