Skip to content

PHP5-aware(ish) class member & multi-line parameter folding #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jesstelford wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PHP5-aware(ish) class member & multi-line parameter folding #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugin/phpfolding.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function! s:PHPCustomFolds() " {{{
call s:PHPFoldPureBlock('function', s:FOLD_WITH_PHPDOC)

" Fold class properties with PhpDoc (var $foo = NULL;)
call s:PHPFoldProperties('^\s*var\s\$', ";", s:FOLD_WITH_PHPDOC, 1, 1)
call s:PHPFoldProperties('^\s*\(\(private\)\|\(public\)\|\(protected\)\|\(var\)\)\s\$', ";", s:FOLD_WITH_PHPDOC, 1, 1)

" Fold class without PhpDoc (class foo {})
call s:PHPFoldPureBlock('^\s*\(abstract\s*\)\?class', s:FOLD_WITH_PHPDOC)
Expand Down Expand Up @@ -380,9 +380,9 @@ function! s:FindPureBlockStart(startPattern) " {{{
" This function can match the line its on *again* if the cursor was
" restored.. hence we search twice if needed..
let currentLine = line('.')
let line = search(a:startPattern . '.*\%[\n].*\%[\n].*{', 'bW')
let line = search(a:startPattern . '.*\(\%[\n].*\)\{,10\}{', 'bW')
if currentLine == line
let line = search(a:startPattern . '.*\%[\n].*\%[\n].*{', 'bW')
let line = search(a:startPattern . '.*\(\%[\n].*\)\{,10\}{', 'bW')
endif
return line
endfunction
Expand Down