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

syntax: refactor syn_finish_line to return bool

Browse Source
This commit is contained in:
Jan Edmund Lazo
2018-06-10 09:09:16 -04:00
parent 2add88eedc
commit dd2e1e9445
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/syntax.c
View File

@@ -428,7 +428,7 @@ void syntax_start(win_T *wp, linenr_T lnum)
if (VALID_STATE(&current_state) if (VALID_STATE(&current_state)
&& current_lnum < lnum && current_lnum < lnum
&& current_lnum < syn_buf->b_ml.ml_line_count) { && current_lnum < syn_buf->b_ml.ml_line_count) {
(void)syn_finish_line(FALSE); (void)syn_finish_line(false);
if (!current_state_stored) { if (!current_state_stored) {
++current_lnum; ++current_lnum;
(void)store_current_state(); (void)store_current_state();
@@ -490,7 +490,7 @@ void syntax_start(win_T *wp, linenr_T lnum)
dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1;
while (current_lnum < lnum) { while (current_lnum < lnum) {
syn_start_line(); syn_start_line();
(void)syn_finish_line(FALSE); (void)syn_finish_line(false);
current_lnum++; current_lnum++;
/* If we parsed at least "minlines" lines or started at a valid /* If we parsed at least "minlines" lines or started at a valid
@@ -588,7 +588,7 @@ static void syn_sync(win_T *wp, linenr_T start_lnum, synstate_T *last_valid)
linenr_T lnum; linenr_T lnum;
linenr_T end_lnum; linenr_T end_lnum;
linenr_T break_lnum; linenr_T break_lnum;
int had_sync_point; bool had_sync_point;
stateitem_T *cur_si; stateitem_T *cur_si;
synpat_T *spp; synpat_T *spp;
char_u *line; char_u *line;
@@ -722,7 +722,7 @@ static void syn_sync(win_T *wp, linenr_T start_lnum, synstate_T *last_valid)
for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum) { for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum) {
syn_start_line(); syn_start_line();
for (;; ) { for (;; ) {
had_sync_point = syn_finish_line(TRUE); had_sync_point = syn_finish_line(true);
// When a sync point has been found, remember where, and // When a sync point has been found, remember where, and
// continue to look for another one, further on in the line. // continue to look for another one, further on in the line.
if (had_sync_point && current_state.ga_len) { if (had_sync_point && current_state.ga_len) {
@@ -802,7 +802,7 @@ static void syn_sync(win_T *wp, linenr_T start_lnum, synstate_T *last_valid)
} }
current_col = found_m_endpos.col; current_col = found_m_endpos.col;
current_lnum = found_m_endpos.lnum; current_lnum = found_m_endpos.lnum;
(void)syn_finish_line(FALSE); (void)syn_finish_line(false);
current_lnum++; current_lnum++;
} else { } else {
current_lnum = start_lnum; current_lnum = start_lnum;
@@ -1502,7 +1502,7 @@ int syntax_check_changed(linenr_T lnum)
* finish the previous line (needed when not all of the line was * finish the previous line (needed when not all of the line was
* drawn) * drawn)
*/ */
(void)syn_finish_line(FALSE); (void)syn_finish_line(false);
/* /*
* Compare the current state with the previously saved state of * Compare the current state with the previously saved state of
@@ -1528,9 +1528,9 @@ int syntax_check_changed(linenr_T lnum)
* the line. It can start anywhere in the line, as long as the current state * the line. It can start anywhere in the line, as long as the current state
* is valid. * is valid.
*/ */
static int static bool
syn_finish_line( syn_finish_line(
int syncing // called for syncing bool syncing // called for syncing
) )
{ {
stateitem_T *cur_si; stateitem_T *cur_si;
@@ -1549,7 +1549,7 @@ syn_finish_line(
if (cur_si->si_idx >= 0 if (cur_si->si_idx >= 0
&& (SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags && (SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags
& (HL_SYNC_HERE|HL_SYNC_THERE))) { & (HL_SYNC_HERE|HL_SYNC_THERE))) {
return TRUE; return true;
} }
/* syn_current_attr() will have skipped the check for an item /* syn_current_attr() will have skipped the check for an item
@@ -1564,7 +1564,7 @@ syn_finish_line(
} }
current_col++; current_col++;
} }
return FALSE; return false;
} }
/* /*