diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-07-30 15:48:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 15:48:32 +0200 |
| commit | 6237ac84024f048ec60475276fbf0663d9d17879 (patch) | |
| tree | a26df8962b063f73b4c85e9906b2e2edb54fb73c /runtime/indent | |
| parent | d36d9be8ff0e03a7cbba087abb9167056f9c56c7 (diff) | |
| download | rneovim-6237ac84024f048ec60475276fbf0663d9d17879.tar.gz rneovim-6237ac84024f048ec60475276fbf0663d9d17879.tar.bz2 rneovim-6237ac84024f048ec60475276fbf0663d9d17879.zip | |
vim-patch:2ecbe53f452e (#19577)
Update runtime files
https://github.com/vim/vim/commit/2ecbe53f452e92e941aff623f6a0b72f80e43d07
Diffstat (limited to 'runtime/indent')
| -rw-r--r-- | runtime/indent/html.vim | 2 | ||||
| -rw-r--r-- | runtime/indent/javascript.vim | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim index a3c32d6342..65e0ffc40c 100644 --- a/runtime/indent/html.vim +++ b/runtime/indent/html.vim @@ -600,7 +600,7 @@ func s:Alien3() endif if b:hi_indent.scripttype == "javascript" " indent for further lines - return eval(b:hi_js1indent) + GetJavascriptIndent() + return GetJavascriptIndent() else return -1 endif diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim index f3bf96aa97..8077442ed0 100644 --- a/runtime/indent/javascript.vim +++ b/runtime/indent/javascript.vim @@ -473,6 +473,12 @@ function GetJavascriptIndent() elseif num return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op) endif + + let nest = get(get(b:, 'hi_indent', {}), 'blocklnr') + if nest + return indent(nextnonblank(nest + 1)) + b_l + is_op + endif + return b_l + is_op endfunction |