Merge branch 'release/0.7.3b'

klen · klen · commit 6acddb2b4c17 · 2013-12-02T21:25:30.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ tags
 test.py
 todo.txt
 vendor
+vim.py
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-12-02 0.7.2b
+## 2013-12-02 0.7.3b
 --------------------
     * Update indentation support;
     * Python3 support;
@@ -35,7 +35,7 @@ Changelog
     * Options added:
         'pymode_rope_regenerate_on_write', 'pymode_rope_completion',
         'pymode_rope_complete_on_dot', 'pymode_lint_sort',
-        'pymode_rope_look_project', 'pymode_lint_unmodified'
+        'pymode_rope_lookup_project', 'pymode_lint_unmodified'
 
     * Commands added:
         'PymodeVirtualenv'
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -47,11 +47,12 @@ 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)
+        let num = winnr()
         botright copen
         exe max([min([line("$"), a:maxHeight]), a:minHeight]) . "wincmd _"
         if a:jumpError
             cc
-        else
+        elseif num != winnr()
             wincmd p
         endif
     else
@@ -109,13 +110,17 @@ fun! pymode#buffer_pre_write() "{{{
 endfunction
 
 fun! pymode#buffer_post_write() "{{{
-    if b:pymode_modified && g:pymode_rope_regenerate_on_write
-        call pymode#debug('regenerate')
-        call pymode#rope#regenerate()
+    if g:pymode_rope
+        if b:pymode_modified && g:pymode_rope_regenerate_on_write
+            call pymode#debug('regenerate')
+            call pymode#rope#regenerate()
+        endif
     endif
-    if g:pymode_lint_unmodified || (g:pymode_lint_on_write && b:pymode_modified)
-        call pymode#debug('check code')
-        call pymode#lint#check()
+    if g:pymode_lint
+        if g:pymode_lint_unmodified || (g:pymode_lint_on_write && b:pymode_modified)
+            call pymode#debug('check code')
+            call pymode#lint#check()
+        endif
     endif
 endfunction "}}}
 
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -65,8 +65,7 @@ fun! pymode#lint#check() "{{{
     call g:PymodeSigns.refresh(loclist)
 
     if g:pymode_lint_cwindow
-        call setqflist(loclist._loclist)
-        call pymode#quickfix_open(0, g:pymode_quickfix_maxheight, g:pymode_quickfix_minheight, 0)
+        call loclist.show()
     endif
 
     call pymode#lint#show_errormessage()
diff --git a/autoload/pymode/rope.vim b/autoload/pymode/rope.vim
@@ -2,6 +2,8 @@
 "
 PymodePython from pymode import rope
 
+call pymode#tools#loclist#init()
+
 
 fun! pymode#rope#completions(findstart, base)
     PymodePython rope.completions()
@@ -56,8 +58,10 @@ fun! pymode#rope#find_it()
     PymodePython rope.find_it()
     call pymode#wide_message('')
     if !empty(l:output)
-        call setqflist(l:output)
-        call pymode#quickfix_open(0, g:pymode_quickfix_maxheight, g:pymode_quickfix_minheight, 0)
+        let loclist = g:PymodeLocList.current()
+        let loclist._loclist = l:output
+        let loclist._title = "Occurrences"
+        call loclist.show()
     end
 endfunction
 
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -43,6 +43,8 @@ let s:efm .= '%-G%.%#'
 
 PymodePython from pymode.run import run_code
 
+call pymode#tools#loclist#init()
+
 
 " DESC: Run python code
 fun! pymode#run#code_run(line1, line2) "{{{
@@ -86,7 +88,11 @@ fun! pymode#run#code_run(line1, line2) "{{{
             call setqflist(qflist)
         endif
 
-        call pymode#quickfix_open(0, g:pymode_quickfix_maxheight, g:pymode_quickfix_maxheight, 0)
+        let loclist = g:PymodeLocList.current()
+        let loclist._loclist = getqflist()
+        let loclist._title = "Run errors"
+        call loclist.show()
+
         let &efm = l:_efm
 
     catch /E234/
diff --git a/autoload/pymode/tools/loclist.vim b/autoload/pymode/tools/loclist.vim
@@ -10,6 +10,7 @@ fun! g:PymodeLocList.init(raw_list) "{{{
     let obj = copy(self)
     let loc_list = filter(copy(a:raw_list), 'v:val["valid"] == 1')
     call obj.clear()
+    let obj._title = 'CodeCheck'
     return obj
 endfunction "}}}
 
@@ -18,7 +19,6 @@ fun! g:PymodeLocList.current() "{{{
     if !exists("b:pymode_loclist")
         let b:pymode_loclist = g:PymodeLocList.init([])
     endif
-    let b:pymode_loclist._bufnr = bufnr('.')
     return b:pymode_loclist
 endfunction "}}}
 
@@ -31,7 +31,7 @@ endfunction "}}}
 fun! g:PymodeLocList.clear() "{{{
     let self._loclist = []
     let self._messages = {}
-    let self._bufnr = bufnr('')
+    let self._name = expand('%:t')
 endfunction "}}}
 
 
@@ -62,3 +62,19 @@ fun! g:PymodeLocList.filter(filters) "{{{
     endfor
     return loclist
 endfunction "}}}
+
+
+fun! g:PymodeLocList.show() "{{{
+    call setloclist(0, self._loclist)
+    if self.is_empty()
+        lclose
+    else
+        let num = winnr()
+        execute "lopen " . g:pymode_quickfix_maxheight
+        execute max([min([line("$"), g:pymode_quickfix_maxheight]), g:pymode_quickfix_minheight]) . "wincmd _"
+        if num != winnr()
+            call setwinvar(winnr(), 'quickfix_title', self._title . ' <' . self._name . '>')
+            wincmd p
+        endif
+    end
+endfunction "}}}
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -6,7 +6,7 @@
     (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.7.2b
+                          Version: 0.7.3b
 
 ==============================================================================
 CONTENTS                                                       *pymode-contents*
@@ -377,9 +377,9 @@ rope finds ``.ropeproject`` in a parent dir, it sets the project for all child
 dirs and the scan may be slow for so many dirs and files.
 
 Enable search |.ropeproject| in parent's directories
-                                                  *'g:pymode_rope_look_project'*
+                                                  *'g:pymode_rope_lookup_project'*
 >
-    let g:pymode_rope_look_project = 1
+    let g:pymode_rope_lookup_project = 1
 
 
 Show documentation for element under cursor ~
@@ -641,7 +641,7 @@ Solutions:
   in the current dir.
 - Run ``:PymodeRopeNewProject`` to make rope create ``.ropeproject`` in the
   current dir.
-- Set |'g:pymode_rope_look_project'| to 0 for prevent searching in parent
+- Set |'g:pymode_rope_lookup_project'| to 0 for prevent searching in parent
   dirs.
 
 
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,5 +1,5 @@
 " vi: fdl=1 
-let g:pymode_version = "0.7.2b"
+let g:pymode_version = "0.7.3b"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
@@ -148,7 +148,7 @@ call pymode#default('g:pymode_breakpoint_cmd', '')
 call pymode#default('g:pymode_rope', 1)
 
 " If project hasnt been finded in current working directory, look at parents directory
-call pymode#default('g:pymode_rope_look_project', 1)
+call pymode#default('g:pymode_rope_lookup_project', 1)
 
 " Enable Rope completion
 call pymode#default('g:pymode_rope_completion', 1)
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -308,7 +308,7 @@ def get_ctx(*args, **kwargs):
             return resources.get(path)
 
         project_path = os.path.dirname(vim.eval('getcwd()'))
-        if int(vim.eval('g:pymode_rope_look_project')):
+        if int(vim.eval('g:pymode_rope_lookup_project')):
             project_path = look_ropeproject(project_path)
 
         ctx = projects.get(project_path)

-Original file line number
+Diff line change
 test.py
 todo.txt
 vendor
 +vim.py