Refactor buffer actions.

klen · klen · commit a7b5e6e74b2d · 2013-11-30T23:45:46.000+07:00
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -43,15 +43,15 @@ fun! pymode#error(msg) "{{{
 endfunction "}}}
 
 " DESC: Open quickfix window
-fun! pymode#quickfix_open(onlyRecognized, holdCursor, maxHeight, minHeight, jumpError) "{{{
+fun! pymode#quickfix_open(onlyRecognized, maxHeight, minHeight, jumpError) "{{{
     let numErrors = len(filter(getqflist(), 'v:val.valid'))
     let numOthers = len(getqflist()) - numErrors
     if numErrors > 0 || (!a:onlyRecognized && numOthers > 0)
         botright copen
         exe max([min([line("$"), a:maxHeight]), a:minHeight]) . "wincmd _"
         if a:jumpError
             cc
-        elseif !a:holdCursor
+        else
             wincmd p
         endif
     else
@@ -103,3 +103,16 @@ fun! pymode#reload_buf_by_nr(nr) "{{{
     exe "e!"
     exe "buffer " . cur
 endfunction "}}}
+
+fun! pymode#buffer_pre_write() "{{{
+    let b:pymode_modified = &modified
+endfunction
+
+fun! pymode#buffer_post_write() "{{{
+    if b:pymode_modified && g:pymode_rope_regenerate_on_write
+        call pymode#rope#regenerate()
+    endif
+    if b:pymode_modified && g:pymode_lint_on_write
+        call pymode#lint#check()
+    endif
+endfunction "}}}
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -9,6 +9,10 @@ if !pymode#default('g:pymode_init', 1)
     call pymode#breakpoint#init()
 endif
 
+" Setup events for pymode
+au pymode BufWritePre <buffer> call pymode#buffer_pre_write()
+au pymode BufWritePost <buffer> call pymode#buffer_post_write()
+
 " Run python code
 if g:pymode_run
 
@@ -63,10 +67,6 @@ if g:pymode_lint
     let b:pymode_errors = {}
     let b:pymode_signs = []
 
-    if g:pymode_lint_on_write
-        au pymode BufWritePost <buffer> PymodeLint
-    endif
-
     if g:pymode_lint_on_fly
         au pymode InsertLeave <buffer> PymodeLint
     endif
@@ -148,13 +148,12 @@ if g:pymode_rope
         inoremap <silent> <buffer> . .<C-R>=pymode#rope#complete_on_dot()<CR>
     end
 
-    au pymode BufWritePost <buffer> call pymode#rope#regenerate()
-
     command! -buffer PymodeRopeNewProject call pymode#rope#new()
     command! -buffer PymodeRopeUndo call pymode#rope#undo()
     command! -buffer PymodeRopeRedo call pymode#rope#redo()
     command! -buffer PymodeRopeRenameModule call pymode#rope#rename_module()
     command! -buffer PymodeRopeModuleToPackage call pymode#rope#module_to_package()
+    command! -buffer PymodeRopeRegenerate call pymode#rope#regenerate()
 
     if g:pymode_rope_autoimport
         command! -buffer PymodeRopeAutoImport call pymode#rope#autoimport(expand('<cword>'))
