vim/vim-polyglot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Adam Stankiewicz 2019-06-16 18:36:23 +02:00
parent 15727e7eb0
commit d527002849
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
autoload/jsx_pretty/indent.vim
View File

@ -124,6 +124,8 @@ function! jsx_pretty#indent#get(js_indent)
else else
return prev_ind return prev_ind
endif endif
elseif prev_line =~ '^\<return'
return prev_ind
else else
return prev_ind - s:sw() return prev_ind - s:sw()
endif endif
@ -188,6 +190,13 @@ function! jsx_pretty#indent#get(js_indent)
else else
let ind = a:js_indent() let ind = a:js_indent()
" Issue #68
" return (<div>
" |<div>)
if prev_line =~ '^\<return' && line =~ '^<\s*' . s:end_tag
return prev_ind
endif
" If current syntax is not a jsx syntax group " If current syntax is not a jsx syntax group
if s:syn_xmlish(prev_syn_eol) && line !~ '^[)\]}]' if s:syn_xmlish(prev_syn_eol) && line !~ '^[)\]}]'
let sol = matchstr(line, s:opfirst) let sol = matchstr(line, s:opfirst)

2
syntax/gitcommit.vim
View File

@ -22,7 +22,7 @@ endif
syn include @gitcommitDiff syntax/diff.vim syn include @gitcommitDiff syntax/diff.vim
syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff
syn match gitcommitSummary ".*\%<50v" contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell syn match gitcommitSummary "^.*\%<51v." contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
syn match gitcommitOverflow ".*" contained contains=@Spell syn match gitcommitOverflow ".*" contained contains=@Spell
syn match gitcommitBlank "^[^#].*" contained contains=@Spell syn match gitcommitBlank "^[^#].*" contained contains=@Spell