Fix bugs.

klen · klen · commit 550f55cec528 · 2013-12-02T17:59:35.000+07:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -21,18 +21,21 @@ Changelog
         'pymode_rope_enable_autoimport' -> 'pymode_rope_autoimport'
 
     * Options removed:
+
         'pymode_lint_hold', 'pymode_lint_config', 'pymode_lint_jump',
         'pymode_lint_signs_always_visible', 'pymode_rope_extended_complete',
         'pymode_rope_auto_project', 'pymode_rope_autoimport_generate',
         'pymode_rope_autoimport_underlines', 'pymode_rope_codeassist_maxfixes',
         'pymode_rope_sorted_completions', 'pymode_rope_extended_complete',
         'pymode_rope_confirm_saving', 'pymode_rope_global_prefix',
-        'pymode_rope_local_prefix', 'pymode_rope_vim_completion', 'pymode_rope_guess_project',
-        'pymode_rope_goto_def_newwin', 'pymode_rope_always_show_complete_menu'
+        'pymode_rope_local_prefix', 'pymode_rope_vim_completion',
+        'pymode_rope_guess_project', 'pymode_rope_goto_def_newwin',
+        'pymode_rope_always_show_complete_menu'
 
     * Options added:
-        'pymode_rope_regenerate_on_write', 'pymode_rope_completion', 'pymode_rope_complete_on_dot',
-        'pymode_lint_sort'
+        'pymode_rope_regenerate_on_write', 'pymode_rope_completion',
+        'pymode_rope_complete_on_dot', 'pymode_lint_sort',
+        'pymode_rope_look_project', 'pymode_lint_unmodified'
 
     * Commands added:
         'PymodeVirtualenv'
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ clean:
 # Temporary disable rope tests on Travis
 .PHONY: travis
 travis:
-	rm -rf t/rope.vim
+	# rm -rf t/rope.vim
 	rake test
 
 .PHONY: test
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -106,13 +106,22 @@ endfunction "}}}
 
 fun! pymode#buffer_pre_write() "{{{
     let b:pymode_modified = &modified
+    if g:pymode_lint_unmodified || (g:pymode_lint_on_write && b:pymode_modified)
+        call pymode#debug('check code')
+        call pymode#lint#check()
+    endif
 endfunction
 
 fun! pymode#buffer_post_write() "{{{
     if b:pymode_modified && g:pymode_rope_regenerate_on_write
+        call pymode#debug('regenerate')
         call pymode#rope#regenerate()
     endif
-    if g:pymode_lint_on_write && (b:pymode_modified || g:pymode_lint_unmodified)
-        call pymode#lint#check()
+endfunction "}}}
+
+fun! pymode#debug(msg) "{{{
+    if g:pymode_debug
+        let g:pymode_debug += 1
+        echom string(g:pymode_debug) . ': ' . string(a:msg)
     endif
 endfunction "}}}
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -48,8 +48,6 @@ endfunction "}}}
 fun! pymode#lint#check() "{{{
     " DESC: Run checkers on current file.
     "
-    if !g:pymode_lint | return | endif
-
     let loclist = g:PymodeLocList.current()
 
     let b:pymode_error_line = -1
@@ -64,13 +62,13 @@ fun! pymode#lint#check() "{{{
         call pymode#wide_message('Code checking is completed. No errors found.')
     endif
 
+    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)
     endif
 
-    call g:PymodeSigns.refresh(loclist)
-
     call pymode#lint#show_errormessage()
     call pymode#wide_message('Found errors and warnings: ' . len(loclist._loclist))
 
diff --git a/autoload/pymode/tools/loclist.vim b/autoload/pymode/tools/loclist.vim
@@ -18,6 +18,7 @@ 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 "}}}
 
@@ -30,6 +31,7 @@ endfunction "}}}
 fun! g:PymodeLocList.clear() "{{{
     let self._loclist = []
     let self._messages = {}
+    let self._bufnr = bufnr('')
 endfunction "}}}
 
 
diff --git a/autoload/pymode/tools/signs.vim b/autoload/pymode/tools/signs.vim
@@ -45,12 +45,11 @@ endfunction "}}}
 
 fun! g:PymodeSigns.place(loclist) "{{{
     let seen = {}
-    let buf = bufnr('')
     for issue in a:loclist._loclist
         if !has_key(seen, issue.lnum)
             let seen[issue.lnum] = 1
             call add(self._sign_ids, self._next_id)
-            execute printf('sign place %d line=%d name=%s buffer=%d', self._next_id, issue.lnum, "Pymode".issue.type[0], buf)
+            execute printf('sign place %d line=%d name=%s buffer=%d', self._next_id, issue.lnum, "Pymode".issue.type[0], issue.bufnr)
             let self._next_id += 1
         endif
     endfor
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -346,6 +346,11 @@ Commands:
 |:PymodeRopeRenameModule| -- Rename current module
 |:PymodeRopeUndo| -- Undo changes from last refactoring
 
+
+Turn on the rope script                                        *'g:pymode_rope'*
+>
+    let g:pymode_rope = 1
+
 .roperoject Folder ~
                                                                   *.ropeproject*
 
@@ -366,10 +371,18 @@ Currently it is used for things such as:
 * It can be used for saving object information to help rope object inference.
 * It can be used for saving global names cache which is used in auto-import.
 
+If ``.ropeproject`` is not found in the current directory, rope will walk
+upwards looking for a ``.ropeproject`` in every dir of the parent path. If
+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.
 
-Turn on the rope script                                        *'g:pymode_rope'*
+Enable search |.ropeproject| in parent's directories
+                                                  *'g:pymode_rope_look_project'*
 >
-    let g:pymode_rope = 1
+    let g:pymode_rope_look_project = 1
+
+
+Show documentation for element under cursor ~
 
 Show documentation for object under cursor.      *'g:pymode_rope_show_doc_bind'*
 Leave empty for disable key binding.
@@ -628,6 +641,8 @@ 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
+  dirs.
 
 
 Pylint check is very slow
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -11,15 +11,11 @@ if !pymode#default('g:pymode_init', 1)
     PymodePython patch_paths()
 endif
 
-augroup pymode
-
-    au!
-
 command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)
 
 " Setup events for pymode
-au BufWritePre <buffer> call pymode#buffer_pre_write()
-au BufWritePost <buffer> call pymode#buffer_post_write()
+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
@@ -74,12 +70,12 @@ if g:pymode_lint
     let b:pymode_error_line = -1
 
     if g:pymode_lint_on_fly
-        au! InsertLeave <buffer> PymodeLint
+        au! pymode InsertLeave <buffer> PymodeLint
     endif
 
     if g:pymode_lint_message
-        au! CursorMoved <buffer>
-        au! CursorMoved <buffer> call pymode#lint#show_errormessage()
+        au! pymode CursorMoved <buffer>
+        au! pymode CursorMoved <buffer> call pymode#lint#show_errormessage()
     endif
 
     " Disabled for current release
@@ -187,5 +183,3 @@ if g:pymode_rope
     end
 
 end
-
-augroup END
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -144,6 +144,9 @@ call pymode#default('g:pymode_breakpoint_cmd', '')
 " Rope support
 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)
+
 " Enable Rope completion
 call pymode#default('g:pymode_rope_completion', 1)
 
diff --git a/pymode/lint.py b/pymode/lint.py
@@ -50,5 +50,8 @@ def __sort(e):
     if sort_rules:
         errors = sorted(errors, key=__sort)
 
+    for e in errors:
+        e['bufnr'] = b.number
+
     vim.command(
         'call g:PymodeLocList.current().extend(%s)' % json.dumps(errors))
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -238,6 +238,7 @@ def organize_imports():
             reload_changes(changes)
 
 
+@catch_and_print_exceptions
 def regenerate():
     """ Clear cache. """
     with RopeContext() as ctx:
@@ -306,7 +307,10 @@ def get_ctx(*args, **kwargs):
         if resources.get(path):
             return resources.get(path)
 
-        project_path = look_ropeproject(os.path.dirname(path))
+        project_path = os.path.dirname(vim.eval('getcwd()'))
+        if int(vim.eval('g:pymode_rope_look_project')):
+            project_path = look_ropeproject(project_path)
+
         ctx = projects.get(project_path)
         if not ctx:
             projects[project_path] = ctx = cls(path, project_path)
@@ -376,6 +380,8 @@ def __init__(self, path, project_path):
         if self.options.get('autoimport') == '1':
             self.generate_autoimport_cache()
 
+        debug('Context inited %s' % project_path)
+
     def __enter__(self):
         self.project.validate(self.project.root)
         self.options['encoding'] = vim.eval('&encoding')
diff --git a/t/rope.vim b/t/rope.vim
@@ -18,13 +18,9 @@ describe 'pymode-plugin'
     it 'pymode rope auto open project in current working directory'
         let project_path = '.ropeproject'
         Expect isdirectory(project_path)  == 0
-        call pymode#rope#complete(0)
-        Expect isdirectory(project_path)  == 1
-    end
-
-    it 'pymode rope completion'
         normal oimporX
         Expect getline('.') == 'import'
+        Expect isdirectory(project_path)  == 1
     end
 
 end
