Mercurial > vim
view runtime/indent/zig.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 | 15c80d8bc515 |
children |
line wrap: on
line source
" Vim filetype indent file " Language: Zig " Upstream: https://github.com/ziglang/zig.vim " Only load this indent file when no other was loaded. if exists("b:did_indent") finish endif let b:did_indent = 1 if (!has("cindent") || !has("eval")) finish endif setlocal cindent " L0 -> 0 indent for jump labels (i.e. case statement in c). " j1 -> indenting for "javascript object declarations" " J1 -> see j1 " w1 -> starting a new line with `(` at the same indent as `(` " m1 -> if `)` starts a line, match its indent with the first char of its " matching `(` line " (s -> use one indent, when starting a new line after a trailing `(` setlocal cinoptions=L0,m1,(s,j1,J1,l1 " cinkeys: controls what keys trigger indent formatting " 0{ -> { " 0} -> } " 0) -> ) " 0] -> ] " !^F -> make CTRL-F (^F) reindent the current line when typed " o -> when <CR> or `o` is used " O -> when the `O` command is used setlocal cinkeys=0{,0},0),0],!^F,o,O setlocal indentexpr=GetZigIndent(v:lnum) let b:undo_indent = "setlocal cindent< cinkeys< cinoptions< indentexpr<" function! GetZigIndent(lnum) let curretLineNum = a:lnum let currentLine = getline(a:lnum) " cindent doesn't handle multi-line strings properly, so force no indent if currentLine =~ '^\s*\\\\.*' return -1 endif let prevLineNum = prevnonblank(a:lnum-1) let prevLine = getline(prevLineNum) " for lines that look like " }, " }; " try treating them the same as a } if prevLine =~ '\v^\s*},$' if currentLine =~ '\v^\s*};$' || currentLine =~ '\v^\s*}$' return indent(prevLineNum) - 4 endif return indent(prevLineNum-1) - 4 endif if currentLine =~ '\v^\s*},$' return indent(prevLineNum) - 4 endif if currentLine =~ '\v^\s*};$' return indent(prevLineNum) - 4 endif " cindent doesn't handle this case correctly: " switch (1): { " 1 => true, " ~ " ^---- indents to here if prevLine =~ '.*=>.*,$' && currentLine !~ '.*}$' return indent(prevLineNum) endif return cindent(a:lnum) endfunction