neovim

commit a785be9cc70152a297f00ee2018a25b8a33bf848
parent c9045f5ba3b721a451f307e22dff095c4e0e7bd8
Author: Christian Clason <c.clason@uni-graz.at>
Date:   Fri, 15 Nov 2024 08:39:12 +0100

vim-patch:0acd3ab: runtime(sh): better function support for bash/zsh in indent script

closes: vim/vim#16052

https://github.com/vim/vim/commit/0acd3abfadf54a97a3cad999791603aa6a8b2248

Co-authored-by: Lukas Zapletal <lzap+git@redhat.com>

Diffstat:
M
runtime/indent/sh.vim
 | 
6
+++++-
A
runtime/indent/testdir/bash.in
 | 
22
++++++++++++++++++++++
A
runtime/indent/testdir/bash.ok
 | 
22
++++++++++++++++++++++

3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim
@@ -7,6 +7,8 @@
 " License:             Vim (see :h license)
 " Repository:          https://github.com/chrisbra/vim-sh-indent
 " Changelog:
+"          20241411  - Detect dash character in function keyword for
+"                      bash mode (issue #16049)
 "          20190726  - Correctly skip if keywords in syntax comments
 "                      (issue #17)
 "          20190603  - Do not indent in zsh filetypes with an `if` in comments
@@ -195,7 +197,9 @@ endfunction
 function! s:is_function_definition(line)
   return a:line =~ '^\s*\<\k\+\>\s*()\s*{' ||
        \ a:line =~ '^\s*{' ||
-       \ a:line =~ '^\s*function\s*\k\+\s*\%(()\)\?\s*{'
+       \ a:line =~ '^\s*function\s*\k\+\s*\%(()\)\?\s*{' ||
+       \ ((&ft is# 'zsh' || s:is_bash()) &&
+       \  a:line =~ '^\s*function\s*\S\+\s*\%(()\)\?\s*{' )
 endfunction
 
 function! s:is_array(line)
diff --git a/runtime/indent/testdir/bash.in b/runtime/indent/testdir/bash.in
@@ -0,0 +1,22 @@
+#!/bin/bash
+# vim: set ft=bash sw=2 noet:
+
+# START_INDENT
+a = 10
+b = 20
+
+function add() {
+c = $((a + b))
+}
+
+function print {
+# do nothing
+}
+
+if [[ $c -ge 15 ]];
+then
+print("ok")
+else
+print("not ok")
+fi
+# END_INDENT
diff --git a/runtime/indent/testdir/bash.ok b/runtime/indent/testdir/bash.ok
@@ -0,0 +1,22 @@
+#!/bin/bash
+# vim: set ft=bash sw=2 noet:
+
+# START_INDENT
+a = 10
+b = 20
+
+function add() {
+  c = $((a + b))
+}
+
+function print {
+  # do nothing
+}
+
+if [[ $c -ge 15 ]];
+then
+  print("ok")
+else
+  print("not ok")
+fi
+# END_INDENT