Mercurial > vim
view runtime/indent/cs.vim @ 34596:5a8340e044f4 v9.1.0190
patch 9.1.0190: complete_info() returns wrong order of items
Commit: https://github.com/vim/vim/commit/8950bf7f8b85c1287d4e696965d88091fcc60594
Author: Girish Palya <girishji@gmail.com>
Date: Wed Mar 20 20:07:29 2024 +0100
patch 9.1.0190: complete_info() returns wrong order of items
Problem: complete_info() returns wrong order of items
(after v9.0.2018)
Solution: Revert Patch v9.0.2018
(Girish Palya)
bug fix: complete_info() gives wrong results
1) complete_info() reverses list of items during <c-p>
2) 'selected' item index is wrong during <c-p>
3) number of items returnd can be wrong
Solution:
- Decouple 'cp_number' from 'selected' index since they need not be
correlated
- Do not iterate the list backwards
- Add targeted tests
Regression introduced by https://github.com/vim/vim/commit/69fb5afb3bc9da24c2fb0eafb0027ba9c6502fc2
Following are unnecessary commits to patch problems from above:
https://github.com/vim/vim/commit/fef66301665027f1801a18d796f74584666f41ef
https://github.com/vim/vim/commit/daef8c74375141974d61b85199b383017644978c
All the tests from above commits are retained though.
fixes: #14204
closes: #14241
Signed-off-by: Girish Palya <girishji@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 20 Mar 2024 20:15:03 +0100 |
parents | c58baa6d6dda |
children |
line wrap: on
line source
" Vim indent file " Language: C# " Maintainer: Nick Jensen <nickspoon@gmail.com> " Former Maintainers: Aquila Deus " Johannes Zellner <johannes@zellner.org> " Last Change: 2020-03-26 " License: Vim (see :h license) " Repository: https://github.com/nickspoons/vim-cs if exists('b:did_indent') finish endif let b:did_indent = 1 let s:save_cpo = &cpoptions set cpoptions&vim setlocal indentexpr=GetCSIndent(v:lnum) function! s:IsCompilerDirective(line) " Exclude #region and #endregion - these should be indented normally return a:line =~# '^\s*#' && !s:IsRegionDirective(a:line) endf function! s:IsRegionDirective(line) return a:line =~# '^\s*#\s*region' || a:line =~# '^\s*#\s*endregion' endf function! s:IsAttributeLine(line) return a:line =~# '^\s*\[[A-Za-z]' && a:line =~# '\]$' endf function! s:FindPreviousNonCompilerDirectiveLine(start_lnum) for delta in range(0, a:start_lnum) let lnum = a:start_lnum - delta let line = getline(lnum) if !s:IsCompilerDirective(line) && !s:IsRegionDirective(line) return lnum endif endfor return 0 endf function! GetCSIndent(lnum) abort " Hit the start of the file, use zero indent. if a:lnum == 0 return 0 endif let this_line = getline(a:lnum) " Compiler directives use zero indent if so configured. let is_first_col_macro = s:IsCompilerDirective(this_line) && stridx(&l:cinkeys, '0#') >= 0 if is_first_col_macro return cindent(a:lnum) endif let lnum = s:FindPreviousNonCompilerDirectiveLine(a:lnum - 1) let previous_code_line = getline(lnum) if s:IsAttributeLine(previous_code_line) return indent(lnum) elseif s:IsRegionDirective(this_line) return cindent(lnum) else return cindent(a:lnum) endif endfunction let b:undo_indent = 'setlocal indentexpr<' let &cpoptions = s:save_cpo unlet s:save_cpo " vim:et:sw=2:sts=2