diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2016-07-05 09:53:49 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2016-07-05 09:53:49 +0200 |
| commit | bf188c4a51a6d151bb2694d73048727f4359c634 (patch) | |
| tree | 3059e2f946ae6293e1809d67393fddced1197431 /indent | |
| parent | a5857b81c215139b3c0def78e5bd2f1da8a17af6 (diff) | |
| download | vim-polyglot-bf188c4a51a6d151bb2694d73048727f4359c634.tar.gz vim-polyglot-bf188c4a51a6d151bb2694d73048727f4359c634.zip | |
Updatev2.11.1
Diffstat (limited to 'indent')
| -rw-r--r-- | indent/blade.vim | 8 | ||||
| -rw-r--r-- | indent/ember-script.vim | 8 | ||||
| -rw-r--r-- | indent/emblem.vim | 8 |
3 files changed, 10 insertions, 14 deletions
diff --git a/indent/blade.vim b/indent/blade.vim index e5bf510c..d578a432 100644 --- a/indent/blade.vim +++ b/indent/blade.vim @@ -36,10 +36,11 @@ function! GetBladeIndent() let line = substitute(substitute(getline(lnum), '\s\+$', '', ''), '^\s\+', '', '') let cline = substitute(substitute(getline(v:lnum), '\s\+$', '', ''), '^\s\+', '', '') let indent = indent(lnum) - let cindent = indent(v:lnum) if cline =~# '@\%(else\|elseif\|empty\|end\|show\|stop\)' || \ cline =~# '\%(<?.*\)\@<!?>\|\%({{.*\)\@<!}}\|\%({!!.*\)\@<!!!}' let indent = indent - &sw + elseif line =~# '<?\%(.*?>\)\@!' + let indent = indent + &sw else if exists("*GetBladeIndentCustom") let hindent = GetBladeIndentCustom() @@ -56,17 +57,12 @@ function! GetBladeIndent() endif endif let increase = indent + &sw - if indent = indent(lnum) - let indent = cindent <= indent ? -1 : increase - endif if line =~# '@\%(section\)\%(.*@end\)\@!' && line !~# '@\%(section\)\s*([^,]*)' return indent elseif line =~# '@\%(if\|elseif\|else\|unless\|foreach\|forelse\|for\|while\|empty\|push\|section\|can\|hasSection\)\%(.*@end\|.*@stop\)\@!' || \ line =~# '{{\%(.*}}\)\@!' || line =~# '{!!\%(.*!!}\)\@!' return increase - elseif line =~# '<?\%(.*?>\)\@!' - return indent(lnum-1) == -1 ? increase : indent(lnum) + increase else return indent endif diff --git a/indent/ember-script.vim b/indent/ember-script.vim index ee2ccc76..29a0daf0 100644 --- a/indent/ember-script.vim +++ b/indent/ember-script.vim @@ -1,10 +1,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1 " Language: ember-script -" Maintainer: heartsentwined <heartsentwined@cogito-lab.com> -" URL: http://github.com/heartsentwined/vim-ember-script -" Version: 1.0.1 -" Last Change: 2013 Apr 17 +" Maintainer: Yulij Andreevich Lesov <yalesov@gmail.com>> +" URL: http://github.com/yalesov/vim-ember-script +" Version: 1.0.3 +" Last Change: 2016 Jul 5 " License: GPL-3.0 if exists('b:did_indent') diff --git a/indent/emblem.vim b/indent/emblem.vim index 8b8bc068..54bab60b 100644 --- a/indent/emblem.vim +++ b/indent/emblem.vim @@ -1,10 +1,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1 " Language: emblem -" Maintainer: heartsentwined <heartsentwined@cogito-lab.com> -" URL: http://github.com/heartsentwined/vim-emblem -" Version: 1.2.0 -" Last Change: 2013 Apr 22 +" Maintainer: Yulij Andreevich Lesov <yalesov@gmail.com> +" URL: http://github.com/yalesov/vim-emblem +" Version: 2.0.0 +" Last Change: 2016 Jul 5 " License: GPL-3.0 endif |