fix(line continuation): set growsize to correct value (#17655)

seandewar · web-flow · commit f24121ad96d7 · 2022-03-08T21:38:10.000Z
Using MAX always sets growsize to 8000, unless ga_len is larger...
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
@@ -1698,7 +1698,7 @@ static bool concat_continued_line(garray_T *const ga, const int init_growsize,
     return false;
   }
   if (ga->ga_len > init_growsize) {
-    ga_set_growsize(ga, MAX(ga->ga_len, 8000));
+    ga_set_growsize(ga, MIN(ga->ga_len, 8000));
   }
   ga_concat_len(ga, (const char *)line + 1, len - 1);
   return true;
@@ -1852,7 +1852,7 @@ static void cmd_source_buffer(const exarg_T *const eap)
   for (linenr_T curr_lnum = eap->line1; curr_lnum <= final_lnum; curr_lnum++) {
     // Adjust growsize to current length to speed up concatenating many lines.
     if (ga.ga_len > 400) {
-      ga_set_growsize(&ga, MAX(ga.ga_len, 8000));
+      ga_set_growsize(&ga, MIN(ga.ga_len, 8000));
     }
     ga_concat(&ga, (char *)ml_get(curr_lnum));
     ga_append(&ga, NL);

Original file line number	Diff line number	Diff line change
`@@ -1698,7 +1698,7 @@ static bool concat_continued_line(garray_T *const ga, const int init_growsize,`
`1698`	`1698`	`return false;`
`1699`	`1699`	`}`
`1700`	`1700`	`if (ga->ga_len > init_growsize) {`
`1701`		`- ga_set_growsize(ga, MAX(ga->ga_len, 8000));`
	`1701`	`+ ga_set_growsize(ga, MIN(ga->ga_len, 8000));`
`1702`	`1702`	`}`
`1703`	`1703`	`ga_concat_len(ga, (const char *)line + 1, len - 1);`
`1704`	`1704`	`return true;`
`@@ -1852,7 +1852,7 @@ static void cmd_source_buffer(const exarg_T *const eap)`
`1852`	`1852`	`for (linenr_T curr_lnum = eap->line1; curr_lnum <= final_lnum; curr_lnum++) {`
`1853`	`1853`	`// Adjust growsize to current length to speed up concatenating many lines.`
`1854`	`1854`	`if (ga.ga_len > 400) {`
`1855`		`- ga_set_growsize(&ga, MAX(ga.ga_len, 8000));`
	`1855`	`+ ga_set_growsize(&ga, MIN(ga.ga_len, 8000));`
`1856`	`1856`	`}`
`1857`	`1857`	`ga_concat(&ga, (char *)ml_get(curr_lnum));`
`1858`	`1858`	`ga_append(&ga, NL);`