aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-19 08:04:27 -04:00
Code Activity

runtime(sh): Update syntax file, fix issue #962 (#14138)

Browse Source 
Allow the opening parenthesis of a multiline array assignment, within an
if statement, to appear at EOL.

Fixes issue #962.

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
dkearns
2024-03-05 05:14:08 +11:00
committed by GitHub
parent 5131f224da
commit 1bdc9435c1
4 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/syntax/sh.vim
View File

@@ -3,8 +3,7 @@
" Maintainer: This runtime file is looking for a new maintainer. " Maintainer: This runtime file is looking for a new maintainer.
" Previous Maintainers: Charles E. Campbell " Previous Maintainers: Charles E. Campbell
" Lennart Schultz <Lennart.Schultz@ecmwf.int> " Lennart Schultz <Lennart.Schultz@ecmwf.int>
" Last Change: Feb 28, 2023 " Last Change: 2024 Mar 04 by Vim Project
" 2024 Feb 19 by Vim Project (announce adoption)
" Version: 208 " Version: 208
" Former URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " Former URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
" For options and settings, please use: :help ft-sh-syntax " For options and settings, please use: :help ft-sh-syntax
@@ -354,7 +353,7 @@ if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
elseif !exists("g:sh_no_error") elseif !exists("g:sh_no_error")
syn region shCommandSub matchgroup=Error start="\$(" end=")" contains=@shCommandSubList syn region shCommandSub matchgroup=Error start="\$(" end=")" contains=@shCommandSubList
endif endif
syn region shCmdParenRegion matchgroup=shCmdSubRegion start="(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList syn region shCmdParenRegion matchgroup=shCmdSubRegion start="((\@!" skip='\\\\\|\\.' end=")" contains=@shCommandSubList
if exists("b:is_bash") if exists("b:is_bash")
syn cluster shCommandSubList add=bashSpecialVariables,bashStatement syn cluster shCommandSubList add=bashSpecialVariables,bashStatement

20
runtime/syntax/testdir/dumps/sh_11_00.dump Normal file
View File

@@ -0,0 +1,20 @@
>#+0#0000e05#ffffff0|!|/|b|i|n|/|b|a|s|h| +0#0000000&@63
@75
|#+0#0000e05&| |I|s@1|u|e| |#|9|6|2| +0#0000000&@62
@75
|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&| +0#0000000&@69
@2|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&| +0#0000000&@65
|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |o|k| +0#0000000&@68
@75
|i+0#af5f00255&|f| |t|r|u|e|;| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@61
@75
@2|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |o|k| +0#0000000&@54
@75
@2|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&| +0#0000000&|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |o|k| +0#0000000&@52
@75
@2|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&| +0#0000000&@67
@4|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&| +0#0000000&@63
@2|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |p|a|r|e|n| |e|r@1|o|r|!| +0#0000000&@56
@75
|f+0#af5f00255&|i| +0#0000000&@72
|i|s|_|b|a|s|h|:| |1|,| @45|1|,|1| @10|T|o|p|

20
runtime/syntax/testdir/dumps/sh_11_99.dump Normal file
View File

@@ -0,0 +1,20 @@
| +0&#ffffff0@74
|#+0#0000e05&| |I|s@1|u|e| |#|9|6|2| +0#0000000&@62
@75
|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&| +0#0000000&@69
@2|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&| +0#0000000&@65
|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |o|k| +0#0000000&@68
@75
|i+0#af5f00255&|f| |t|r|u|e|;| +0#0000000&|t+0#af5f00255&|h|e|n| +0#0000000&@61
@75
@2|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |o|k| +0#0000000&@54
@75
@2|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&| +0#0000000&|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&| +0#0000000&|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |o|k| +0#0000000&@52
@75
@2|a+0#00e0e07&|r@1|=+0#0000000&|(+0#e000e06&| +0#0000000&@67
@4|1+0#e000002&| +0#0000000&|2+0#e000002&| +0#0000000&|3+0#e000002&| +0#0000000&|4+0#e000002&| +0#0000000&@63
@2|)+0#e000e06&| +0#0000000&|#+0#0000e05&| |p|a|r|e|n| |e|r@1|o|r|!| +0#0000000&@56
@75
|f+0#af5f00255&|i| +0#0000000&@72
> @74
@57|2|0|,|0|-|1| @7|B|o|t|

20
runtime/syntax/testdir/input/sh_11.sh Executable file
View File

@@ -0,0 +1,20 @@
#!/bin/bash
# Issue #962
arr=(
1 2 3 4
) # ok
if true; then
arr=(1 2 3 4) # ok
arr=( 1 2 3 4 ) # ok
arr=(
1 2 3 4
) # paren error!
fi