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

vim-patch:8.2.0027: still some /* */ comments

Browse Source 
Problem:    Still some /* */ comments.
Solution:   Convert to // comments.
aa2f0ee639
This commit is contained in:
Jan Edmund Lazo
2020-03-24 22:59:28 -04:00
parent b3e249db7c
commit 0f18c718cd
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/indent.c
View File

@@ -56,7 +56,8 @@ int get_indent_buf(buf_T *buf, linenr_T lnum)
// Count the size (in window cells) of the indent in line "ptr", with // Count the size (in window cells) of the indent in line "ptr", with
// 'tabstop' at "ts". // 'tabstop' at "ts".
// If @param list is TRUE, count only screen size for tabs. // If @param list is TRUE, count only screen size for tabs.
int get_indent_str(char_u *ptr, int ts, int list) int get_indent_str(const char_u *ptr, int ts, int list)
FUNC_ATTR_NONNULL_ALL
{ {
int count = 0; int count = 0;
@@ -375,12 +376,12 @@ int get_number_indent(linenr_T lnum)
* parameters into account. Window must be specified, since it is not * parameters into account. Window must be specified, since it is not
* necessarily always the current one. * necessarily always the current one.
*/ */
int get_breakindent_win(win_T *wp, char_u *line) int get_breakindent_win(win_T *wp, const char_u *line)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ALL
{ {
static int prev_indent = 0; // Cached indent value. static int prev_indent = 0; // Cached indent value.
static long prev_ts = 0; // Cached tabstop value. static long prev_ts = 0; // Cached tabstop value.
static char_u *prev_line = NULL; // cached pointer to line. static const char_u *prev_line = NULL; // cached pointer to line.
static varnumber_T prev_tick = 0; // Changedtick of cached value. static varnumber_T prev_tick = 0; // Changedtick of cached value.
int bri = 0; int bri = 0;
// window width minus window margin space, i.e. what rests for text // window width minus window margin space, i.e. what rests for text
@@ -389,7 +390,7 @@ int get_breakindent_win(win_T *wp, char_u *line)
&& (vim_strchr(p_cpo, CPO_NUMCOL) == NULL) && (vim_strchr(p_cpo, CPO_NUMCOL) == NULL)
? number_width(wp) + 1 : 0); ? number_width(wp) + 1 : 0);
/* used cached indent, unless pointer or 'tabstop' changed */ // used cached indent, unless pointer or 'tabstop' changed
if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts
|| prev_tick != buf_get_changedtick(wp->w_buffer)) { || prev_tick != buf_get_changedtick(wp->w_buffer)) {
prev_line = line; prev_line = line;
@@ -399,21 +400,22 @@ int get_breakindent_win(win_T *wp, char_u *line)
} }
bri = prev_indent + wp->w_p_brishift; bri = prev_indent + wp->w_p_brishift;
/* indent minus the length of the showbreak string */ // indent minus the length of the showbreak string
if (wp->w_p_brisbr) if (wp->w_p_brisbr) {
bri -= vim_strsize(p_sbr); bri -= vim_strsize(p_sbr);
}
/* Add offset for number column, if 'n' is in 'cpoptions' */ // Add offset for number column, if 'n' is in 'cpoptions'
bri += win_col_off2(wp); bri += win_col_off2(wp);
/* never indent past left window margin */ // never indent past left window margin
if (bri < 0) if (bri < 0) {
bri = 0; bri = 0;
/* always leave at least bri_min characters on the left, } else if (bri > eff_wwidth - wp->w_p_brimin) {
* if text width is sufficient */ // always leave at least bri_min characters on the left,
else if (bri > eff_wwidth - wp->w_p_brimin) // if text width is sufficient
bri = (eff_wwidth - wp->w_p_brimin < 0) bri = (eff_wwidth - wp->w_p_brimin < 0)
? 0 : eff_wwidth - wp->w_p_brimin; ? 0 : eff_wwidth - wp->w_p_brimin;
}
return bri; return bri;
} }