runtime(vim): update indentation plugin for Vim script
Make the indent script aware of enums and ensure those will be correctly
indented.
fixes: #16289
closes: #16293
Co-authored-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Jim Zhou <csd_189@163.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/autoload/dist/vimindent.vim b/runtime/autoload/dist/vimindent.vim
index 727e983..0681496 100644
--- a/runtime/autoload/dist/vimindent.vim
+++ b/runtime/autoload/dist/vimindent.vim
@@ -2,11 +2,12 @@
# Language: Vim script
# Maintainer: github user lacygoill
-# Last Change: 2024 Nov 08
+# Last Change: 2024 Dec 26
#
# Includes changes from The Vim Project:
# - 2024 Feb 09: Fix indent after literal Dict (A. Radev via #13966)
# - 2024 Nov 08: Fix indent after :silent! function (D. Kearns via #16009)
+# - 2024 Dec 26: Fix indent for enums (Jim Zhou via #16293)
# NOTE: Whenever you change the code, make sure the tests are still passing:
#
@@ -172,6 +173,7 @@
def: ['export', 'static'],
class: ['export', 'abstract', 'export abstract'],
interface: ['export'],
+ enum: ['export'],
}
# ...
# class: ['export', 'abstract', 'export abstract'],
@@ -634,6 +636,7 @@
elseif !line_A.isfirst
&& (line_B->EndsWithLineContinuation()
|| line_A.text =~ LINE_CONTINUATION_AT_SOL)
+ && !(line_B->EndsWithComma() && line_A.lnum->IsInside('EnumBlock'))
return shiftwidth()
endif
@@ -1051,6 +1054,22 @@
enddef
def IsInside(lnum: number, syntax: string): bool # {{{3
+ if syntax == 'EnumBlock'
+ var cur_pos = getpos('.')
+ cursor(lnum, 1)
+ var enum_pos = search('^\C\s*\%(export\s\)\=\s*enum\s\+\S\+', 'bnW')
+ var endenum_pos = search('^\C\s*endenum\>', 'bnW')
+ setpos('.', cur_pos)
+
+ if enum_pos == 0 && endenum_pos == 0
+ return false
+ endif
+ if (enum_pos > 0 && (endenum_pos == 0 || enum_pos > endenum_pos))
+ return true
+ endif
+ return false
+ endif
+
if !exists('b:vimindent')
|| !b:vimindent->has_key($'is_{syntax}')
return false