mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-30 14:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0861: solution for "!!sort" in closed fold is not optimal (#21027)

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 vim/vim#11487)

9954dc39ea

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2022-11-12 07:43:36 +08:00
committed by GitHub
parent 0d7cc5ee85
commit eee9560516
4 changed files with 103 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/ex_docmd.c
View File

@@ -3224,8 +3224,6 @@ static linenr_T get_address(exarg_T *eap, char **ptr, cmd_addr_T addr_type, int
char *cmd = skipwhite(*ptr);
linenr_T lnum = MAXLNUM;
do {
const int base_char = (uint8_t)(*cmd);
switch (*cmd) {
case '.': // '.' - Cursor position
cmd++;
@@ -3502,16 +3500,10 @@ static linenr_T get_address(exarg_T *eap, char **ptr, cmd_addr_T addr_type, int
} else if (addr_type == ADDR_LOADED_BUFFERS || addr_type == ADDR_BUFFERS) {
lnum = compute_buffer_local_count(addr_type, lnum, (i == '-') ? -1 * n : n);
} else {
// 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.
bool 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);
}
if (i == '-') {
@@ -3522,11 +3514,6 @@ static linenr_T get_address(exarg_T *eap, char **ptr, cmd_addr_T addr_type, int
goto error;
}
lnum += n;
// ".+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);
}
}
}
}