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.0861: solution for "!!sort" in closed fold is not optimal

Browse Source 
Problem:    Solution for "!!sort" in closed fold is not optimal.
Solution:   Use a different range instead of the subtle difference in handling
            a range with an offset. (issue #11487)
This commit is contained in:
Bram Moolenaar
2022-11-11 22:58:36 +00:00
parent a20be06f97
commit 9954dc39ea
5 changed files with 114 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ex_docmd.c
View File

@@ -4308,9 +4308,6 @@ get_address(
lnum = MAXLNUM;
do
{
#ifdef FEAT_FOLDING
int base_char = *cmd;
#endif
switch (*cmd)
{
case '.': // '.' - Cursor position
@@ -4631,16 +4628,10 @@ get_address(
else
{
#ifdef FEAT_FOLDING
// 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 != '.'))
// Relative line addressing: need to adjust for lines in a
// closed fold after the first address.
if (addr_type == ADDR_LINES && (i == '-' || i == '+')
&& address_count >= 2)
(void)hasFolding(lnum, NULL, &lnum);
#endif
if (i == '-')
@@ -4653,12 +4644,6 @@ 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
}
}
}