diff options
| author | kawaii-Code <nia.personal.0@gmail.com> | 2024-01-25 21:40:05 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-25 21:40:05 +0100 |
| commit | 78019df645400796831670ec166e7e3b55ae8310 (patch) | |
| tree | c0dac27c30055e2f84b5d56f2b81832f2d1de92f | |
| parent | 703f9bc943a29d947869b5cb0370be2ac42d5ac9 (diff) | |
patch 9.1.0055: formatting long lines is slowv9.1.0055
Problem: formatting long lines is slow
(kawaii-Code)
Solution: optimize gq (internal_format) for long
lines (kawaii-Code)
Implemented two workarounds that significantly reduce
the amount of pointless calls. Ideally the algorithm
would be rewritten not to be n^2, but it's too complicated
with too many corner cases.
closes: #13914
Signed-off-by: kawaii-Code <nia.personal.0@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/textformat.c | 30 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 26 insertions, 6 deletions
diff --git a/src/textformat.c b/src/textformat.c index 5a52950c5e..500e8895c8 100644 --- a/src/textformat.c +++ b/src/textformat.c @@ -90,11 +90,18 @@ internal_format( colnr_T end_col; int wcc; // counter for whitespace chars int did_do_comment = FALSE; + int first_pass; - virtcol = get_nolist_virtcol() - + char2cells(c != NUL ? c : gchar_cursor()); - if (virtcol <= (colnr_T)textwidth) - break; + // Cursor is currently at the end of line. No need to format + // if line length is less than textwidth (8 * textwidth for + // utf safety) + if (curwin->w_cursor.col < 8 * textwidth) + { + virtcol = get_nolist_virtcol() + + char2cells(c != NUL ? c : gchar_cursor()); + if (virtcol <= (colnr_T)textwidth) + break; + } if (no_leader) do_comments = FALSE; @@ -144,9 +151,17 @@ internal_format( coladvance((colnr_T)textwidth); wantcol = curwin->w_cursor.col; - curwin->w_cursor.col = startcol; + // If startcol is large (a long line), formatting takes too much + // time. The algorithm is O(n^2), it walks from the end of the + // line to textwidth border every time for each line break. + // + // Ceil to 8 * textwidth to optimize. + curwin->w_cursor.col = startcol < 8 * textwidth ? startcol : + 8 * textwidth; + foundcol = 0; skip_pos = 0; + first_pass = TRUE; // Find position to break at. // Stop at first entered white when 'formatoptions' has 'v' @@ -155,8 +170,11 @@ internal_format( || curwin->w_cursor.lnum != Insstart.lnum || curwin->w_cursor.col >= Insstart.col) { - if (curwin->w_cursor.col == startcol && c != NUL) + if (first_pass && c != NUL) + { cc = c; + first_pass = FALSE; + } else cc = gchar_cursor(); if (WHITECHAR(cc)) diff --git a/src/version.c b/src/version.c index fe10b9569a..2a654c1d75 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 55, +/**/ 54, /**/ 53, |