Mercurial > vim
view runtime/indent/zig.vim @ 33393:016d8f863230 v9.0.1955
patch 9.0.1955: Vim9: lockvar issues with objects/classes
Commit: https://github.com/vim/vim/commit/ee865f37acab6cac2cee6a171d60e1b365f852b0
Author: Ernie Rael <errael@raelity.com>
Date: Fri Sep 29 19:53:55 2023 +0200
patch 9.0.1955: Vim9: lockvar issues with objects/classes
Problem: Vim9: lockvar issues with objects/classes
Solution: fix `get_lhs()` object/class access and avoid `SEGV`,
make error messages more accurate.
- `get_lval()` detects/returns object/class access
- `compile_lock_unlock()` generate code for bare static and obj_arg access
- `do_lock_var()` check lval for `ll_object`/`ll_class` and fail if so.
Details:
- Add `ll_object`/`ll_class`/`ll_oi` to `lval_T`.
- Add `lockunlock_T` to `isn_T` for `is_arg` to specify handling of `lval_root` in `get_lval()`.
- In `get_lval()`, fill in `ll_object`/`ll_class`/`ll_oi` as needed; when no `[idx] or .key`, check lval_root on the way out.
- In `do_lock_var()` check for `ll_object`/`ll_class`; also bullet proof ll_dict case
and give `Dictionay required` if problem. (not needed to avoid lockvar crash anymore)
- In `compile_lock_unlock()` compile for the class variable and func arg cases.
closes: #13174
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ernie Rael <errael@raelity.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 29 Sep 2023 20:00:07 +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