improved folding of various cases

fmv1992 · fmv1992 · commit a8dcbc8805bf · 2017-02-06T12:32:59.000-02:00
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -200,7 +200,7 @@ fun! s:BlockStart(lnum) "{{{
 
     " Now find the class/def one shiftwidth lower than the start of the
     " aforementioned indent block.
-    if next_stmt_at_def_indent && a:lnum <= next_stmt_at_def_indent 
+    if next_stmt_at_def_indent && next_stmt_at_def_indent < a:lnum
         let max_indent = max([indent(next_stmt_at_def_indent) - &shiftwidth, 0])
     else
         let max_indent = max([indent(prevnonblank(a:lnum)) - &shiftwidth, 0])
@@ -211,14 +211,6 @@ endfunction "}}}
 fun! s:BlockEnd(lnum) "{{{
     " Note: Make sure to reset cursor position after using this function.
     call cursor(a:lnum, 0)
-    " Regex translation:
-        "   \v: very magic
-        "   \s: any space char
-        "   {...}: zero to more as many as possible
-        "   \S: non whitespace
-        "   index [0]: gets the line returned by searchpos
-        "   flag 'n': do not move cursor
-        "   flag 'W': don't wrap around the end of the file
     return searchpos('\v^\s{,'.indent('.').'}\S', 'nW')[0] - 1
 endfunction "}}}
 
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,5 +1,5 @@
 " vi: fdl=1
-let g:pymode_version = "0.8.1"
+let g:pymode_version = "0.9.0"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
@@ -39,7 +39,8 @@ call pymode#default("g:pymode_folding", 1)
 " Maximum file length to check for nested class/def statements
 call pymode#default("g:pymode_folding_nest_limit", 1000)
 " Change for folding customization (by example enable fold for 'if', 'for')
-call pymode#default("g:pymode_folding_regex", '^\s*\%(class\|def\) \w\+')
+call pymode#default("g:pymode_folding_regex", '^\s*\%(class\|def\|async\s\+def\) .\+\(:\s\+\w\)\@!')
+
 
 " Enable/disable python motion operators
 call pymode#default("g:pymode_motion", 1)
@@ -314,4 +315,3 @@ endif
 command! PymodeVersion echomsg "Pymode version: " . g:pymode_version . " interpreter: " . g:pymode_python . " lint: " . g:pymode_lint . " rope: " . g:pymode_rope
 
 augroup pymode
-
