diff options
| author | Andrew Radev <andrey.radev@gmail.com> | 2024-02-09 19:44:28 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-09 19:46:59 +0100 |
| commit | 415a5a951ba6a827ecafc2e13bf341ed4e124ad6 (patch) | |
| tree | c46c41ba191d8deffa589f4b2f3147c350261364 | |
| parent | e06e43766500ecb4cd1031fa16cf9cbebdb222c1 (diff) | |
runtime(vim): Fix indent after line with literal dict
closes: #13966
Signed-off-by: Andrew Radev <andrey.radev@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/autoload/dist/vimindent.vim | 5 | ||||
| -rw-r--r-- | runtime/indent/testdir/vim.in | 5 | ||||
| -rw-r--r-- | runtime/indent/testdir/vim.ok | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/runtime/autoload/dist/vimindent.vim b/runtime/autoload/dist/vimindent.vim index a5e04a5391..07b21538e1 100644 --- a/runtime/autoload/dist/vimindent.vim +++ b/runtime/autoload/dist/vimindent.vim @@ -3,6 +3,9 @@ vim9script # Language: Vim script # Maintainer: github user lacygoill # Last Change: 2023 Jun 29 +# +# Includes Changes from Vim: +# - 2024 Feb 09: Fix indent after literal Dict (A. Radev via #13966) # NOTE: Whenever you change the code, make sure the tests are still passing: # @@ -381,7 +384,7 @@ const LINE_CONTINUATION_AT_EOL: string = '\%(' # It can be the start of a dictionary or a block. # We only want to match the former. .. '\|' .. $'^\%({STARTS_CURLY_BLOCK}\)\@!.*\zs{{' - .. '\)\s*\%(\s#.*\)\=$' + .. '\)\s*\%(\s#[^{].*\)\=$' # }}}2 # SOL {{{2 # BACKSLASH_AT_SOL {{{3 diff --git a/runtime/indent/testdir/vim.in b/runtime/indent/testdir/vim.in index c2e149ab37..1ff2d0d000 100644 --- a/runtime/indent/testdir/vim.in +++ b/runtime/indent/testdir/vim.in @@ -946,3 +946,8 @@ Blue Black endenum " END_INDENT + +" START_INDENT +call prop_type_add('indent_after_literal_dict', #{ foo: 'bar' }) +call prop_type_delete('indent_after_literal_dict') +" END_INDENT diff --git a/runtime/indent/testdir/vim.ok b/runtime/indent/testdir/vim.ok index b10e081dd8..fa8869b61f 100644 --- a/runtime/indent/testdir/vim.ok +++ b/runtime/indent/testdir/vim.ok @@ -946,3 +946,8 @@ enum Color Black endenum " END_INDENT + +" START_INDENT +call prop_type_add('indent_after_literal_dict', #{ foo: 'bar' }) +call prop_type_delete('indent_after_literal_dict') +" END_INDENT |