Mercurial > vim
view src/testdir/test_compiler.vim @ 35308:22c03485f222 v9.1.0456
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed
Author: Gary Johnson <garyjohn@spocom.com>
Date: Sat Jun 1 20:51:33 2024 +0200
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 01 Jun 2024 21:00:03 +0200 |
parents | 84bd7cb1251d |
children |
line wrap: on
line source
" Test the :compiler command source check.vim source shared.vim func Test_compiler() CheckExecutable perl CheckFeature quickfix let save_LC_ALL = $LC_ALL let $LC_ALL= "C" " %:S does not work properly with 'shellslash' set let save_shellslash = &shellslash set noshellslash e Xfoo.pl compiler perl call assert_equal('perl', b:current_compiler) call assert_fails('let g:current_compiler', 'E121:') let verbose_efm = execute('verbose set efm') call assert_match('Last set from .*[/\\]compiler[/\\]perl.vim ', verbose_efm) call setline(1, ['#!/usr/bin/perl -w', 'use strict;', 'my $foo=1']) w! call feedkeys(":make\<CR>\<CR>", 'tx') call assert_fails('clist', 'E42:') call setline(1, ['#!/usr/bin/perl -w', 'use strict;', '$foo=1']) w! call feedkeys(":make\<CR>\<CR>", 'tx') let a=execute('clist') call assert_match('\n \d\+ Xfoo.pl:3: Global symbol "$foo" ' \ . 'requires explicit package name', a) let &shellslash = save_shellslash call delete('Xfoo.pl') bw! let $LC_ALL = save_LC_ALL endfunc func GetCompilerNames() return glob('$VIMRUNTIME/compiler/*.vim', 0, 1) \ ->map({i, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).vim', '\1', '')}) \ ->sort() endfunc func Test_compiler_without_arg() let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') let a = split(execute('compiler')) let exp = GetCompilerNames() call assert_match(runtime .. '/compiler/' .. exp[0] .. '.vim$', a[0]) call assert_match(runtime .. '/compiler/' .. exp[1] .. '.vim$', a[1]) call assert_match(runtime .. '/compiler/' .. exp[-1] .. '.vim$', a[-1]) endfunc " Test executing :compiler from the command line, not from a script func Test_compiler_commandline() call system(GetVimCommandClean() .. ' --not-a-term -c "compiler gcc" -c "call writefile([b:current_compiler], ''XcompilerOut'')" -c "quit"') call assert_equal(0, v:shell_error) call assert_equal(["gcc"], readfile('XcompilerOut')) call delete('XcompilerOut') endfunc func Test_compiler_completion() let clist = GetCompilerNames()->join(' ') call feedkeys(":compiler \<C-A>\<C-B>\"\<CR>", 'tx') call assert_match('^"compiler ' .. clist .. '$', @:) call feedkeys(":compiler p\<C-A>\<C-B>\"\<CR>", 'tx') call assert_match('"compiler pandoc pbx perl\( p[a-z_]\+\)\+ pylint pyunit', @:) call feedkeys(":compiler! p\<C-A>\<C-B>\"\<CR>", 'tx') call assert_match('"compiler! pandoc pbx perl\( p[a-z_]\+\)\+ pylint pyunit', @:) endfunc func Test_compiler_error() let g:current_compiler = 'abc' call assert_fails('compiler doesnotexist', 'E666:') call assert_equal('abc', g:current_compiler) call assert_fails('compiler! doesnotexist', 'E666:') unlet! g:current_compiler endfunc " vim: shiftwidth=2 sts=2 expandtab