Mercurial > vim
view runtime/autoload/RstFold.vim @ 34511:5397ce113043 v9.1.0161
patch 9.1.0161: expand() removes slash after env variable that ends with colon
Commit: https://github.com/vim/vim/commit/13a014452a7a020a119ac555a690c65b41f3126d
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sat Mar 9 17:44:46 2024 +0100
patch 9.1.0161: expand() removes slash after env variable that ends with colon
Problem: expand() removes a slash after an environment variable that
ends with a colon on Windows.
Solution: Check the correct char for a colon (zeertzjq)
closes: #14161
Note: Vim still removes the path-separator at the end, if another path separator
follows directly after it, e.g. on:
```
echo $FOO='/usr/'
echo expand('$FOO/bar') == '/usr/bar'
```
see:
,----[ misc1.c:1630 ]
| // if var[] ends in a path separator and tail[] starts
| // with it, skip a character
| if (after_pathsep(dst, dst + c)
| #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA)
| && (dst == save_dst || dst[-1] != ':')
| #endif
| && vim_ispathsep(*tail))
| ++tail;
`----
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 09 Mar 2024 18:15:02 +0100 |
parents | 9d3d7b0f4861 |
children |
line wrap: on
line source
" Author: Antony Lee <anntzer.lee@gmail.com> " Description: Helper functions for reStructuredText syntax folding " Last Modified: 2018-12-29 function s:CacheRstFold() if !g:rst_fold_enabled return endif let closure = {'header_types': {}, 'max_level': 0, 'levels': {}} function closure.Process(match) dict let curline = getcurpos()[1] if has_key(self.levels, curline - 1) " For over+under-lined headers, the regex will match both at the " overline and at the title itself; in that case, skip the second match. return endif let lines = split(a:match, '\n') let key = repeat(lines[-1][0], len(lines)) if !has_key(self.header_types, key) let self.max_level += 1 let self.header_types[key] = self.max_level endif let self.levels[curline] = self.header_types[key] endfunction let save_cursor = getcurpos() let save_mark = getpos("'[") silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn call setpos('.', save_cursor) call setpos("'[", save_mark) let b:RstFoldCache = closure.levels endfunction function RstFold#GetRstFold() if !g:rst_fold_enabled return endif if !has_key(b:, 'RstFoldCache') call s:CacheRstFold() endif if has_key(b:RstFoldCache, v:lnum) return '>' . b:RstFoldCache[v:lnum] else return '=' endif endfunction function RstFold#GetRstFoldText() if !g:rst_fold_enabled return endif if !has_key(b:, 'RstFoldCache') call s:CacheRstFold() endif let indent = repeat(' ', b:RstFoldCache[v:foldstart] - 1) let thisline = getline(v:foldstart) " For over+under-lined headers, skip the overline. let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline return indent . text endfunction