adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime(vim): Fix indent after :silent! function

Browse Source 
See 35699f1749 (commitcomment-148816912)

closes: #16009

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Doug Kearns
2024-11-10 20:36:28 +01:00
committed by Christian Brabandt
parent 7c5152826f
commit 7724d621f2
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/autoload/dist/vimindent.vim vendored
View File

@ -2,10 +2,11 @@ vim9script
# Language: Vim script # Language: Vim script
# Maintainer: github user lacygoill # Maintainer: github user lacygoill
# Last Change: 2023 Jun 29 # Last Change: 2024 Nov 08
# #
# Includes Changes from Vim: # Includes changes from The Vim Project:
# - 2024 Feb 09: Fix indent after literal Dict (A. Radev via #13966) # - 2024 Feb 09: Fix indent after literal Dict (A. Radev via #13966)
# - 2024 Nov 08: Fix indent after :silent! function (D. Kearns via #16009)
# NOTE: Whenever you change the code, make sure the tests are still passing: # NOTE: Whenever you change the code, make sure the tests are still passing:
# #
@ -295,7 +296,7 @@ patterns = []
endfor endfor
} }
const STARTS_NAMED_BLOCK: string = $'^\s*\%(sil\%[ent]\s\+\)\=\%({patterns->join('\|')}\)\>\%(\s\|$\|!\)\@=' const STARTS_NAMED_BLOCK: string = $'^\s*\%(sil\%[ent]!\=\s\+\)\=\%({patterns->join('\|')}\)\>\%(\s\|$\|!\)\@='
# STARTS_CURLY_BLOCK {{{3 # STARTS_CURLY_BLOCK {{{3

9
runtime/indent/testdir/vim.in
View File

@ -951,3 +951,12 @@ endenum
call prop_type_add('indent_after_literal_dict', #{ foo: 'bar' }) call prop_type_add('indent_after_literal_dict', #{ foo: 'bar' })
call prop_type_delete('indent_after_literal_dict') call prop_type_delete('indent_after_literal_dict')
" END_INDENT " END_INDENT
" START_INDENT
silent function Foo()
return 42
endfunction
silent! function Bar()
return 42
endfunction
" END_INDENT

9
runtime/indent/testdir/vim.ok
View File

@ -951,3 +951,12 @@ endenum
call prop_type_add('indent_after_literal_dict', #{ foo: 'bar' }) call prop_type_add('indent_after_literal_dict', #{ foo: 'bar' })
call prop_type_delete('indent_after_literal_dict') call prop_type_delete('indent_after_literal_dict')
" END_INDENT " END_INDENT
" START_INDENT
silent function Foo()
return 42
endfunction
silent! function Bar()
return 42
endfunction
" END_INDENT