mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 17:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(plines): style of new plines.c file

Browse Source
This commit is contained in:
Björn Linse
2021-08-10 23:06:48 +02:00
parent 7f71e8a6b3
commit b506643dfc
1 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/nvim/plines.c
View File

@@ -32,27 +32,17 @@
# include "plines.c.generated.h" # include "plines.c.generated.h"
#endif #endif
int plines_win(
win_T *const wp, /// @param winheight when true limit to window height
const linenr_T lnum, int plines_win(win_T *wp, linenr_T lnum, bool winheight)
const bool winheight // when true limit to window height
)
{ {
/* Check for filler lines above this buffer line. When folded the result // Check for filler lines above this buffer line. When folded the result
* is one line anyway. */ // is one line anyway.
return plines_win_nofill(wp, lnum, winheight) + diff_check_fill(wp, lnum); return plines_win_nofill(wp, lnum, winheight) + diff_check_fill(wp, lnum);
} }
int plines_nofill(const linenr_T lnum) /// @param winheight when true limit to window height
{ int plines_win_nofill(win_T *wp, linenr_T lnum, bool winheight)
return plines_win_nofill(curwin, lnum, true);
}
int plines_win_nofill(
win_T *const wp,
const linenr_T lnum,
const bool winheight // when true limit to window height
)
{ {
if (!wp->w_p_wrap) { if (!wp->w_p_wrap) {
return 1; return 1;
@@ -74,19 +64,18 @@ int plines_win_nofill(
return lines; return lines;
} }
/* /// @Return number of window lines physical line "lnum" will occupy in window
* Return number of window lines physical line "lnum" will occupy in window /// "wp". Does not care about folding, 'wrap' or 'diff'.
* "wp". Does not care about folding, 'wrap' or 'diff'.
*/
int plines_win_nofold(win_T *wp, linenr_T lnum) int plines_win_nofold(win_T *wp, linenr_T lnum)
{ {
char_u *s; char_u *s;
unsigned int col; unsigned int col;
int width; int width;
s = ml_get_buf(wp->w_buffer, lnum, FALSE); s = ml_get_buf(wp->w_buffer, lnum, false);
if (*s == NUL) /* empty line */ if (*s == NUL) { // empty line
return 1; return 1;
}
col = win_linetabsize(wp, s, MAXCOL); col = win_linetabsize(wp, s, MAXCOL);
// If list mode is on, then the '$' at the end of the line may take up one // If list mode is on, then the '$' at the end of the line may take up one
@@ -95,9 +84,7 @@ int plines_win_nofold(win_T *wp, linenr_T lnum)
col += 1; col += 1;
} }
/* // Add column offset for 'number', 'relativenumber' and 'foldcolumn'.
* Add column offset for 'number', 'relativenumber' and 'foldcolumn'.
*/
width = wp->w_width_inner - win_col_off(wp); width = wp->w_width_inner - win_col_off(wp);
if (width <= 0 || col > 32000) { if (width <= 0 || col > 32000) {
return 32000; // bigger than the number of screen columns return 32000; // bigger than the number of screen columns
@@ -111,18 +98,17 @@ int plines_win_nofold(win_T *wp, linenr_T lnum)
return ((int)col + (width - 1)) / width + 1; return ((int)col + (width - 1)) / width + 1;
} }
/* /// Like plines_win(), but only reports the number of physical screen lines
* Like plines_win(), but only reports the number of physical screen lines /// used from the start of the line to the given column number.
* used from the start of the line to the given column number.
*/
int plines_win_col(win_T *wp, linenr_T lnum, long column) int plines_win_col(win_T *wp, linenr_T lnum, long column)
{ {
// Check for filler lines above this buffer line. When folded the result // Check for filler lines above this buffer line. When folded the result
// is one line anyway. // is one line anyway.
int lines = diff_check_fill(wp, lnum); int lines = diff_check_fill(wp, lnum);
if (!wp->w_p_wrap) if (!wp->w_p_wrap) {
return lines + 1; return lines + 1;
}
if (wp->w_width_inner == 0) { if (wp->w_width_inner == 0) {
return lines + 1; return lines + 1;
@@ -154,8 +140,9 @@ int plines_win_col(win_T *wp, linenr_T lnum, long column)
} }
lines += 1; lines += 1;
if (col > width) if (col > width) {
lines += (col - width) / (width + win_col_off2(wp)) + 1; lines += (col - width) / (width + win_col_off2(wp)) + 1;
}
return lines; return lines;
} }