mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 13:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:partial:9.0.1166: code is indented more than necessary (#21716)

Browse Source 
Problem:    Code is indented more than necessary.
Solution:   Use an early return where it makes sense. (Yegappan Lakshmanan,
            closes vim/vim#11792)

1cfb14aa97

Partial port as some highlight.c changes depend on previous patches.
Cherry-pick fname_match() change from patch 8.2.4959.
Omit internal_func_check_arg_types(): only used for Vim9 script.

N/A patches for version.c:

vim-patch:9.0.1167: EditorConfig files do not have their own filetype

Problem:    EditorConfig files do not have their own filetype.
Solution:   Add the "editorconfig" filetype. (Gregory Anders, closes vim/vim#11779)

d41262ed06

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
zeertzjq
2023-01-10 08:46:42 +08:00
committed by GitHub
parent 364b131f42
commit dc7edce650
12 changed files with 300 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/nvim/eval/funcs.c
View File

@@ -859,14 +859,14 @@ static void f_cindent(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
win_T *get_optional_window(typval_T *argvars, int idx)
{
win_T *win = curwin;
if (argvars[idx].v_type == VAR_UNKNOWN) {
return curwin;
}
if (argvars[idx].v_type != VAR_UNKNOWN) {
win = find_win_by_nr_or_id(&argvars[idx]);
if (win == NULL) {
emsg(_(e_invalwindow));
return NULL;
}
win_T *win = find_win_by_nr_or_id(&argvars[idx]);
if (win == NULL) {
emsg(_(e_invalwindow));
return NULL;
}
return win;
}
@@ -6109,55 +6109,57 @@ static int get_search_arg(typval_T *varp, int *flagsp)
{
int dir = FORWARD;
if (varp->v_type != VAR_UNKNOWN) {
char nbuf[NUMBUFLEN];
const char *flags = tv_get_string_buf_chk(varp, nbuf);
if (flags == NULL) {
return 0; // Type error; errmsg already given.
}
int mask;
while (*flags != NUL) {
switch (*flags) {
case 'b':
dir = BACKWARD; break;
case 'w':
p_ws = true; break;
case 'W':
p_ws = false; break;
default:
mask = 0;
if (flagsp != NULL) {
switch (*flags) {
case 'c':
mask = SP_START; break;
case 'e':
mask = SP_END; break;
case 'm':
mask = SP_RETCOUNT; break;
case 'n':
mask = SP_NOMOVE; break;
case 'p':
mask = SP_SUBPAT; break;
case 'r':
mask = SP_REPEAT; break;
case 's':
mask = SP_SETPCMARK; break;
case 'z':
mask = SP_COLUMN; break;
}
}
if (mask == 0) {
semsg(_(e_invarg2), flags);
dir = 0;
} else {
*flagsp |= mask;
if (varp->v_type == VAR_UNKNOWN) {
return FORWARD;
}
char nbuf[NUMBUFLEN];
const char *flags = tv_get_string_buf_chk(varp, nbuf);
if (flags == NULL) {
return 0; // Type error; errmsg already given.
}
int mask;
while (*flags != NUL) {
switch (*flags) {
case 'b':
dir = BACKWARD; break;
case 'w':
p_ws = true; break;
case 'W':
p_ws = false; break;
default:
mask = 0;
if (flagsp != NULL) {
switch (*flags) {
case 'c':
mask = SP_START; break;
case 'e':
mask = SP_END; break;
case 'm':
mask = SP_RETCOUNT; break;
case 'n':
mask = SP_NOMOVE; break;
case 'p':
mask = SP_SUBPAT; break;
case 'r':
mask = SP_REPEAT; break;
case 's':
mask = SP_SETPCMARK; break;
case 'z':
mask = SP_COLUMN; break;
}
}
if (dir == 0) {
break;
if (mask == 0) {
semsg(_(e_invarg2), flags);
dir = 0;
} else {
*flagsp |= mask;
}
flags++;
}
if (dir == 0) {
break;
}
flags++;
}
return dir;
}