aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 9.0.0858: "!!sort" in a closed fold sorts too many lines

Browse Source 
Problem:    "!!sort" in a closed fold sorts too many lines.
Solution:   Round to end of fold after adding the line count. (closes #11487)
This commit is contained in:
Bram Moolenaar
2022-11-11 01:20:35 +00:00
parent 37f1030fd6
commit f00112d558
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ex_docmd.c
View File

@@ -4308,6 +4308,8 @@ get_address(
lnum = MAXLNUM;
do
{
int base_char = *cmd;
switch (*cmd)
{
case '.': // '.' - Cursor position
@@ -4602,10 +4604,11 @@ get_address(
i = '+'; // "number" is same as "+number"
else
i = *cmd++;
if (!VIM_ISDIGIT(*cmd)) // '+' is '+1', but '+0' is not '+1'
if (!VIM_ISDIGIT(*cmd)) // '+' is '+1'
n = 1;
else
{
// "number", "+number" or "-number"
n = getdigits(&cmd);
if (n == MAXLNUM)
{
@@ -4627,10 +4630,16 @@ get_address(
else
{
#ifdef FEAT_FOLDING
// Relative line addressing, need to adjust for folded lines
// now, but only do it after the first address.
if (addr_type == ADDR_LINES && (i == '-' || i == '+')
&& address_count >= 2)
// Relative line addressing: need to adjust for closed folds
// after the first address.
// Subtle difference: "number,+number" and "number,-number"
// adjusts to end of closed fold before adding/subtracting,
// while "number,.+number" adjusts to end of closed fold after
// adding to make "!!" expanded into ".,.+N" work correctly.
int adjust_for_folding = addr_type == ADDR_LINES
&& (i == '-' || i == '+')
&& address_count >= 2;
if (adjust_for_folding && (i == '-' || base_char != '.'))
(void)hasFolding(lnum, NULL, &lnum);
#endif
if (i == '-')
@@ -4643,6 +4652,12 @@ get_address(
goto error;
}
lnum += n;
#ifdef FEAT_FOLDING
// ".+number" rounds up to the end of a closed fold after
// adding, so that ":!!sort" sorts one closed fold.
if (adjust_for_folding && base_char == '.')
(void)hasFolding(lnum, NULL, &lnum);
#endif
}
}
}