diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-02 21:42:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-02 21:42:23 +0200 |
| commit | e18dbe865d190e74fb5d43ac8bc6ac22507d0223 (patch) | |
| tree | b95cb3a293646f8f2284f668bb518f353dd1ee92 /runtime/indent/sh.vim | |
| parent | 0fcc7c6dd1902b71e0e7d0a35ddabafef6455a83 (diff) | |
| download | vim-git-e18dbe865d190e74fb5d43ac8bc6ac22507d0223.tar.gz | |
Updated runtime files.
Diffstat (limited to 'runtime/indent/sh.vim')
| -rw-r--r-- | runtime/indent/sh.vim | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim index d05bb3770..aca110f50 100644 --- a/runtime/indent/sh.vim +++ b/runtime/indent/sh.vim @@ -3,9 +3,15 @@ " Maintainer: Christian Brabandt <cb@256bit.org> " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org> " Original Author: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2016-02-15 +" Latest Revision: 2016-06-27 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-sh-indent +" Changelog: +" 20160627: - detect heredocs correctly +" 20160213: - detect function definition correctly +" 20160202: - use shiftwidth() function +" 20151215: - set b:undo_indent variable +" 20150728: - add foreach detection for zsh if exists("b:did_indent") finish @@ -102,6 +108,8 @@ function! GetShIndent() endif elseif s:is_case_break(line) let ind -= s:indent_value('case-breaks') + elseif s:is_here_doc(line) + let ind = 0 endif return ind @@ -160,6 +168,14 @@ function! s:is_case_break(line) return a:line =~ '^\s*;[;&]' endfunction +function! s:is_here_doc(line) + if a:line =~ '^\w\+$' + let here_pat = '<<-\?'. s:escape(a:line). '\$' + return search(here_pat, 'bnW') > 0 + endif + return 0 +endfunction + function! s:is_case_ended(line) return s:is_case_break(a:line) || a:line =~ ';[;&]\s*\%(#.*\)\=$' endfunction @@ -172,5 +188,9 @@ function! s:is_case_empty(line) endif endfunction +function! s:escape(pattern) + return '\V'. escape(a:pattern, '\\') +endfunction + let &cpo = s:cpo_save unlet s:cpo_save |