refact: rename function name and improve debug info

This commit is contained in:
yemai
2019-04-25 17:41:52 +08:00
parent 461a4574c1
commit cbf28c57b1

View File

@@ -46,17 +46,17 @@ function! SynsEOL(lnum)
return map(synstack(lnum, col), 'synIDattr(v:val, "name")') return map(synstack(lnum, col), 'synIDattr(v:val, "name")')
endfunction endfunction
function! SynsHTMLish(syns) function! SynsHTML(syns)
let first_syn = get(a:syns, 0) let first_syn = get(a:syns, 0)
return first_syn =~? '\v^(vueTemplate)' return first_syn =~? '\v^(vueTemplate)'
endfunction endfunction
function! SynsPugish(syns) function! SynsPug(syns)
let second_syn = get(a:syns, 1) let second_syn = get(a:syns, 1)
return second_syn =~? '\v^(vueTemplatePug)' return second_syn =~? '\v^(vueTemplatePug)'
endfunction endfunction
function! SynsCSSish(syns) function! SynsCSS(syns)
let first_syn = get(a:syns, 0) let first_syn = get(a:syns, 0)
return first_syn =~? '\v^(vueStyle)' return first_syn =~? '\v^(vueStyle)'
endfunction endfunction
@@ -72,11 +72,11 @@ function! GetVueIndent()
let cursyns = SynsEOL(v:lnum) let cursyns = SynsEOL(v:lnum)
let prevsyns = SynsEOL(v:lnum - 1) let prevsyns = SynsEOL(v:lnum - 1)
if SynsPugish(prevsyns) if SynsPug(prevsyns)
call s:LogMsg('type: pug') call s:LogMsg('syntax: pug')
let ind = GetPugIndent() let ind = GetPugIndent()
elseif SynsHTMLish(prevsyns) elseif SynsHTML(prevsyns)
call s:LogMsg('type: html') call s:LogMsg('syntax: html')
let ind = XmlIndentGet(v:lnum, 0) let ind = XmlIndentGet(v:lnum, 0)
" Align '/>' and '>' with '<' for multiline tags. " Align '/>' and '>' with '<' for multiline tags.
@@ -88,11 +88,11 @@ function! GetVueIndent()
let ind = ind + &sw let ind = ind + &sw
endif endif
elseif SynsCSSish(prevsyns) elseif SynsCSS(prevsyns)
call s:LogMsg('type: css') call s:LogMsg('syntax: css')
let ind = GetCSSIndent() let ind = GetCSSIndent()
else else
call s:LogMsg('type: javascript') call s:LogMsg('syntax: javascript')
if len(b:vue_js_indentexpr) if len(b:vue_js_indentexpr)
let ind = eval(b:vue_js_indentexpr) let ind = eval(b:vue_js_indentexpr)
else else
@@ -101,21 +101,21 @@ function! GetVueIndent()
endif endif
if curline =~? s:vue_tag if curline =~? s:vue_tag
call s:LogMsg('cur vue tag') call s:LogMsg('current is vue tag')
let ind = 0 let ind = 0
elseif (exists("g:vim_vue_plugin_has_init_indent") elseif (exists("g:vim_vue_plugin_has_init_indent")
\ && g:vim_vue_plugin_has_init_indent != 0) \ && g:vim_vue_plugin_has_init_indent != 0)
if SynsVueScope(cursyns) && ind == 0 if SynsVueScope(cursyns) && ind == 0
call s:LogMsg('add init') call s:LogMsg('add initial indent')
let ind = &sw let ind = &sw
endif endif
else else
if prevline =~? s:vue_tag_no_indent if prevline =~? s:vue_tag_no_indent
call s:LogMsg('prev vue tag') call s:LogMsg('prev is vue tag')
let ind = 0 let ind = 0
endif endif
endif endif
call s:LogMsg('result ind: '.ind) call s:LogMsg('result indent: '.ind)
return ind return ind
endfunction endfunction