diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-07-29 21:36:21 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-07-29 21:36:21 +0100 |
commit | 2ecbe53f452e92e941aff623f6a0b72f80e43d07 (patch) | |
tree | dc241cf0a9c463f24777f2b0df8ef08d1314f099 /runtime/indent | |
parent | 72981ac94ff7aeaa596d535448ee0bef46050acf (diff) |
Update runtime files
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 |