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

Remove code duplication in get_cursor_rel_lnum

Browse Source
This commit is contained in:
Pavel Platto
2014-05-20 11:41:49 +03:00
committed by Justin M. Keyes
parent a01f7948bc
commit 7e3681c32e
1 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/nvim/cursor.c
View File

@@ -259,47 +259,34 @@ int dec_cursor(void)
return dec(&curwin->w_cursor); return dec(&curwin->w_cursor);
} }
/* /// Get the line number relative to the current cursor position, i.e. the
* Get the line number relative to the current cursor position, i.e. the /// difference between line number and cursor position. Only look for lines that
* difference between line number and cursor position. Only look for lines that /// can be visible, folded lines don't count.
* can be visible, folded lines don't count. ///
*/ /// @param lnum line number to get the result for
linenr_T get_cursor_rel_lnum( linenr_T get_cursor_rel_lnum(win_T *wp, linenr_T lnum)
win_T *wp,
linenr_T lnum /* line number to get the result for */
)
{ {
linenr_T cursor = wp->w_cursor.lnum; linenr_T cursor = wp->w_cursor.lnum;
linenr_T retval = 0; if (lnum == cursor || !hasAnyFolding(wp)) {
return lnum - cursor;
if (hasAnyFolding(wp)) {
if (lnum > cursor) {
while (lnum > cursor) {
(void)hasFoldingWin(wp, lnum, &lnum, NULL, true, NULL);
/* if lnum and cursor are in the same fold,
* now lnum <= cursor */
if (lnum > cursor)
retval++;
lnum--;
}
} else if (lnum < cursor) {
while (lnum < cursor) {
(void)hasFoldingWin(wp, lnum, NULL, &lnum, true, NULL);
/* if lnum and cursor are in the same fold,
* now lnum >= cursor */
if (lnum < cursor)
retval--;
lnum++;
}
}
/* else if (lnum == cursor)
* retval = 0;
*/
} else {
retval = lnum - cursor;
} }
return retval; linenr_T from_line = lnum < cursor ? lnum : cursor;
linenr_T to_line = lnum > cursor ? lnum : cursor;
linenr_T retval = 0;
// Loop until we reach to_line, skipping folds.
for (; from_line < to_line; from_line++, retval++) {
// If from_line is in a fold, set it to the last line of that fold.
hasFoldingWin(wp, from_line, NULL, &from_line, true, NULL);
}
// If to_line is in a closed fold, the line count is off by +1. Correct it.
if (from_line > to_line) {
retval--;
}
return (lnum < cursor) ? -retval : retval;
} }
/* /*