added branch develop to Travis CI build and solved gh issue python-mode#814 (on the folding jumping problem)

fmv1992 · fmv1992 · commit 60c638d0b939 · 2017-11-21T23:55:34.000-02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,7 @@
-# Deactivated.
-# This plugin needs a robust test suite.
+# Build vim from source with python3 support and execute tests.
 branches:
   only:
-    # - develop
-    - dev_imp_test
+    - develop
 before_install:
     - export ORIGINAL_FOLDER=$PWD
     - sudo apt install libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev python3-dev lua5.1 lua5.1-dev libperl-dev git
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -46,7 +46,9 @@ endfunction "}}}
 
 fun! pymode#folding#expr(lnum) "{{{
 
-    return pymode#folding#foldcase(a:lnum)['foldlevel']
+    let l:return_value = pymode#folding#foldcase(a:lnum)['foldlevel']
+
+    return l:return_value
 
 endfunction "}}}
 
@@ -138,9 +140,7 @@ fun! pymode#folding#foldcase(lnum) "{{{
     let line_block_start = s:BlockStart(a:lnum)
     let line_block_end = s:BlockEnd(a:lnum)
     let prev_line_block_start = s:BlockStart(a:lnum - 1)
-    let save_cursor = getcurpos()
     if line !~ s:blank_regex
-        call setpos('.', save_cursor)
         if line_block_start == prev_line_block_start
                 \ || a:lnum  - line_block_start == 1
             let l:foldcase = 'non blank line; first line of block or part of it'
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -54,11 +54,30 @@ endif
 
 " Python folding
 if g:pymode_folding
+    " On the folding problem.
+    " =======================
+    " What happens when your enter insert mode with fdm=expr:
+    " TODO:
+    "
+    " What happens when your leave insert mode and trigger fdm=expr:
+    " TODO:
 
     setlocal foldmethod=expr
     setlocal foldexpr=pymode#folding#expr(v:lnum)
     setlocal foldtext=pymode#folding#text()
 
+
+    au! pymode InsertEnter *.py setlocal foldmethod=manual
+    au! pymode InsertLeave *.py let s:save_winview = winsaveview()
+
+    au pymode InsertLeave *.py let s:save_cursor = getcurpos()
+    au pymode InsertLeave *.py set nofoldenable
+    au pymode InsertLeave *.py setlocal foldmethod=expr
+    au pymode InsertLeave *.py set foldenable
+    au pymode InsertLeave *.py call winrestview(s:save_winview)
+    au pymode InsertLeave *.py call setpos('.', s:save_cursor)
+    au pymode InsertLeave *.py call winrestview(s:save_winview)
+
 endif
 
 " Remove unused whitespaces
diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-![](https://travis-ci.org/klen/python-mode.png?branch=develop)
+![](https://travis-ci.org/python-mode/python-mode.svg?branch=develop)
 
 ![](https://raw.github.com/python-mode/python-mode/develop/logo.png)
 # Python-mode, a Python IDE for Vim

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-![](https://travis-ci.org/klen/python-mode.png?branch=develop)`
	`1`	`+![](https://travis-ci.org/python-mode/python-mode.svg?branch=develop)`
`2`	`2`
`3`	`3`	`![](https://raw.github.com/python-mode/python-mode/develop/logo.png)`
`4`	`4`	`# Python-mode, a Python IDE for Vim`