Merge pull request python-mode#868 from jennaliu/develop

diraol · web-flow · commit 126b09b55e42 · 2018-03-27T12:06:01.000-03:00
Fix python-mode#826 "Pymode seems to freeze on opening a very simple file and trying to source folding.vim"
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -228,17 +228,11 @@ fun! s:BlockStart(lnum) "{{{
     " W: don't Wrap around the end of the file
     let previous_definition = searchpos(s:def_regex, 'bnW')
 
-    " Corner case of function being defined on the first line.
-    if previous_definition[0] == 1
-        " Just skip the while loop.
-    elseif previous_definition != [0, 0]
-        " Lines that are blank have zero indent.
-        while previous_definition != [0, 0]
-                \ && indent(previous_definition[0]) >= l:inferred_indent
-            let previous_definition = searchpos(s:def_regex, 'bnW')
-            call cursor(previous_definition[0] - 1, 0)
-        endwhile
-    endif
+    while previous_definition[0] != 1 && previous_definition != [0, 0]
+            \ && indent(previous_definition[0]) >= l:inferred_indent
+        let previous_definition = searchpos(s:def_regex, 'bnW')
+        call cursor(previous_definition[0] - 1, 0)
+    endwhile
     let last_def = previous_definition[0]
     if last_def
         call cursor(last_def, 0)
