Add file length limit for checking for nested folds

wilywampa · wilywampa · commit 09dc5efccff2 · 2014-11-18T18:35:50.000-07:00
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -57,8 +57,9 @@ fun! pymode#folding#expr(lnum) "{{{
         return "<".(indent / &shiftwidth + 1)
     endif
 
-    " Handle nested defs
-    if indent(prevnonblank(a:lnum))
+    " Handle nested defs but only for files shorter than
+    " g:pymode_folding_nest_limit lines due to performance concerns
+    if line('$') < g:pymode_folding_nest_limit && indent(prevnonblank(a:lnum))
         let curpos = getcurpos()
         try
             let last_block = s:BlockStart(a:lnum)
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -36,6 +36,8 @@ call pymode#default("g:pymode_indent", 1)
 
 " Enable/disable pymode folding for pyfiles.
 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\+')
 
