VimPlug/vim-vue-plugin
1
0
Fork 0
mirror of https://github.com/leafOfTree/vim-vue-plugin.git synced 2025-12-08 21:54:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix foldexpr on config and custom blocks

Browse Source
This commit is contained in:
leafOfTree
2021-04-06 13:37:00 +08:00
parent 11c04aaf7b
commit 59e9825606
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ftplugin/vue/fold.vim
View File

@@ -3,10 +3,11 @@
" Config {{{
"
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let s:use_foldexpr = vue#GetConfig("use_foldexpr", 0)
let s:config = vue#GetConfig('config', {})
let s:enable_foldexpr = s:config.foldexpr
"}}}
if !s:use_foldexpr | finish | endif
if !s:enable_foldexpr | finish | endif
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"
@@ -25,9 +26,8 @@ setlocal foldexpr=GetVueFold(v:lnum)
"
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let s:empty_line = '\v^\s*$'
let s:block_end = '\v^\s*}|]|\)'
let s:vue_tag_start = '\v^\s*\<(script|style|template)'
let s:vue_tag_end = '\v^\s*\<\/(script|style|template)'
let s:vue_tag_start = '\v^\s*\<\w+'
let s:vue_tag_end = '\v^\s*\<\/\w+'
"}}}
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -78,6 +78,7 @@ function! GetVueFold(lnum)
let this_indent = s:IndentLevel(a:lnum)
let next_indent = s:IndentLevel(s:NextNonBlankLine(a:lnum))
" Handle <script> block specially
if GetVueTag(a:lnum) == 'script'
" Handle closing '}'
if this_line =~ '\v^\s*},?\s*$'
@@ -96,7 +97,7 @@ function! GetVueFold(lnum)
return this_indent
endif
else
" Template or style
" Handle other blocks
return this_indent
endif
endfunction