Support autoimport keywords in completion

klen · klen · commit 886d08bca2fc · 2013-11-26T00:46:34.000+07:00
diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim
@@ -41,9 +41,9 @@ if g:pymode_rope && g:pymode_rope_completion
 
     setlocal omnifunc=pymode#rope#completions
 
-    exe "inoremap <silent> <buffer> " . g:pymode_rope_completion_bind . " <C-R>=pymode#rope#complete()<CR>"
+    exe "inoremap <silent> <buffer> " . g:pymode_rope_completion_bind . " <C-R>=pymode#rope#complete(0)<CR>"
     if tolower(g:pymode_rope_completion_bind) == '<c-space>'
-        exe "inoremap <silent> <buffer> <Nul> <C-R>=pymode#rope#complete()<CR>"
+        exe "inoremap <silent> <buffer> <Nul> <C-R>=pymode#rope#complete(0)<CR>"
     endif
 
 end
diff --git a/autoload/pymode/rope.vim b/autoload/pymode/rope.vim
@@ -7,11 +7,15 @@ fun! pymode#rope#completions(findstart, base)
     PymodePython rope.completions()
 endfunction
 
-fun! pymode#rope#complete()
+fun! pymode#rope#complete(dot)
     if pumvisible()
         return "\<C-n>"
     end
-    PymodePython rope.complete()
+    if a:dot
+        PymodePython rope.complete(True)
+    else
+        PymodePython rope.complete()
+    end
     return pumvisible() ? "\<C-p>\<Down>" : ""
 endfunction
 
@@ -26,7 +30,7 @@ fun! pymode#rope#complete_on_dot() "{{{
             endif
         endfor
     endfor
-    return pymode#rope#complete()
+    return pymode#rope#complete(1)
 endfunction "}}}
 
 fun! pymode#rope#goto_definition()
@@ -121,6 +125,13 @@ fun! pymode#rope#inline() "{{{
     PymodePython rope.InlineRefactoring().run()
 endfunction "}}}
 
+fun! pymode#rope#move() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.MoveRefactoring().run()
+endfunction "}}}
+
 fun! pymode#rope#use_function() "{{{
     if !pymode#save()
         return 0
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -76,9 +76,9 @@ if g:pymode_lint
     endif
 
     if g:pymode_lint_async
-        let &l:updatetime = g:pymode_lint_async_updatetime
-        au! pymode BufEnter <buffer> call pymode#lint#start()
-        au! pymode BufLeave <buffer> call pymode#lint#stop()
+        " let &l:updatetime = g:pymode_lint_async_updatetime
+        " au! pymode BufEnter <buffer> call pymode#lint#start()
+        " au! pymode BufLeave <buffer> call pymode#lint#stop()
     end
 
 endif
@@ -131,6 +131,10 @@ if g:pymode_rope
         exe "noremap <silent> <buffer> " . g:pymode_rope_inline_bind . " :call pymode#rope#inline()<CR>"
     end
 
+    if g:pymode_rope_move_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_move_bind . " :call pymode#rope#move()<CR>"
+    end
+
     if g:pymode_rope_use_function_bind != ""
         exe "noremap <silent> <buffer> " . g:pymode_rope_use_function_bind . " :call pymode#rope#use_function()<CR>"
     end
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -170,6 +170,12 @@ call pymode#default('g:pymode_rope', 1)
 " Enable Rope completion
 call pymode#default('g:pymode_rope_completion', 1)
 
+" Complete keywords from not imported modules (could make completion slower)
+call pymode#default('g:pymode_rope_autoimport', 1)
+
+" Autoimported modules
+call pymode#default('g:pymode_rope_autoimport_modules', ['os', 'shutil', 'datetime'])
+
 " Automatic completion on dot
 call pymode#default('g:pymode_rope_complete_on_dot', 1)
 
@@ -209,6 +215,9 @@ call pymode#default('g:pymode_rope_extract_variable_bind', '<C-c>rl')
 " Inline refactoring
 call pymode#default('g:pymode_rope_inline_bind', '<C-c>ri')
 
+" Move refactoring
+call pymode#default('g:pymode_rope_move_bind', '<C-c>rv')
+
 " Tries to find the places in which a function can be used and changes the
 " code to call it instead
 call pymode#default('g:pymode_rope_use_function_bind', '<C-c>ru')
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -8,6 +8,7 @@
 import sys
 import re
 import json
+import multiprocessing
 from .utils import (
     message, PY2, error, pymode_input, pymode_inputlist, pymode_y_n)
 
@@ -19,7 +20,7 @@
 from rope.base import project, libutils, exceptions, change # noqa
 from rope.base.fscommands import FileSystemCommands # noqa
 from rope.contrib import autoimport, codeassist, findit # noqa
-from rope.refactor import ModuleToPackage, ImportOrganizer, rename, extract, inline, usefunction # noqa
+from rope.refactor import ModuleToPackage, ImportOrganizer, rename, extract, inline, usefunction, move # noqa
 from rope.base.taskhandle import TaskHandle # noqa
 
 
@@ -85,15 +86,15 @@ def completions():
     vim.command("return %s" % json.dumps(proposals))
 
 
-def complete():
+def complete(dot=False):
     """ Ctrl+Space completion.
 
     :return bool: success
 
     """
     row, column = vim.current.window.cursor
     source, offset = get_assist_params((row, column))
-    proposals = get_proporsals(source, offset)
+    proposals = get_proporsals(source, offset, dot=dot)
     if not proposals:
         return False
 
@@ -116,7 +117,7 @@ def complete():
     return True
 
 
-def get_proporsals(source, offset, base=''):
+def get_proporsals(source, offset, base='', dot=False):
     """ Code assist.
 
     :return str:
@@ -136,7 +137,7 @@ def get_proporsals(source, offset, base=''):
         proposals = sorted(proposals, key=_sort_proporsals)
 
         out = []
-        preview = 'preview' in ctx.completeopt
+        preview = 'preview' in ctx.options.get('completeopt')
         for p in proposals:
             out.append(dict(
                 word=p.name,
@@ -145,6 +146,8 @@ def get_proporsals(source, offset, base=''):
                 info=p.get_doc() or "No docs." if preview else "",
             ))
 
+        out = _get_autoimport_proposals(out, ctx, source, offset, dot=dot)
+
     return out
 
 
@@ -334,17 +337,22 @@ def __init__(self, path, project_path):
         update_python_path(self.project.prefs.get('python_path', []))
 
         self.resource = None
-        self.completeopt = vim.eval('&completeopt')
         self.options = dict(
-            goto_definition_cmd=vim.eval('g:pymode_rope_goto_definition_cmd')
+            completeopt=vim.eval('&completeopt'),
+            autoimport=vim.eval('g:pymode_rope_autoimport'),
+            autoimport_modules=vim.eval('g:pymode_rope_autoimport_modules'),
+            goto_definition_cmd=vim.eval('g:pymode_rope_goto_definition_cmd'),
         )
-        self.encoding = vim.eval('&encoding')
 
         if os.path.exists("%s/__init__.py" % project_path):
             sys.path.append(project_path)
 
+        if self.options.get('autoimport') == '1':
+            self.generate_autoimport_cache()
+
     def __enter__(self):
         self.project.validate(self.project.root)
+        self.options['encoding'] = vim.eval('&encoding')
         self.resource = libutils.path_to_resource(
             self.project, vim.current.buffer.name, 'file')
         return self
@@ -353,11 +361,19 @@ def __exit__(self, t, value, traceback):
         if t is None:
             self.project.close()
 
-    def generate_modules_cache(self, modules):
-        """ Generate modules cache. """
-        message("Generate Modules cache ...")
-        self.importer.generate_modules_cache(modules)
-        self.project.sync()
+    def generate_autoimport_cache(self):
+        """ Update autoimport cache. """
+
+        def _update_cache(importer, modules=None):
+
+            importer.generate_cache()
+            if modules:
+                importer.generate_modules_cache(modules)
+            importer.project.sync()
+
+        process = multiprocessing.Process(target=_update_cache, args=(
+            self.importer, self.options.get('autoimport_modules')))
+        process.start()
 
 
 class ProgressHandler(object):
@@ -397,6 +413,7 @@ def run(self):
 
         with RopeContext() as ctx:
             try:
+                message(self.__doc__)
                 refactor = self.get_refactor(ctx)
                 input_str = self.get_input_str(refactor, ctx)
                 if not input_str:
@@ -435,15 +452,24 @@ def get_refactor(ctx):
 
     @staticmethod
     def get_input_str(refactor, ctx):
-        """ Get user input. """
+        """ Get user input. Skip by default.
 
-        raise NotImplementedError
+        :return bool: True
+
+        """
+
+        return True
 
     @staticmethod
-    def get_changes(refactor, ctx):
-        """ Get changes. """
+    def get_changes(refactor, input_str):
+        """ Get changes.
 
-        raise NotImplementedError
+        :return Changes:
+
+        """
+        progress = ProgressHandler('Calculate changes ...')
+        return refactor.get_changes(
+            input_str, task_handle=progress.handle)
 
 
 class RenameRefactoring(Refactoring):
@@ -480,18 +506,6 @@ def get_input_str(self, refactor, ctx):
 
         return newname
 
-    @staticmethod
-    def get_changes(refactor, input_str):
-        """ Get changes.
-
-        :return Changes:
-
-        """
-
-        progress = ProgressHandler('Calculate changes ...')
-        return refactor.get_changes(
-            input_str, task_handle=progress.handle)
-
 
 class ExtractMethodRefactoring(Refactoring):
 
@@ -567,12 +581,6 @@ class InlineRefactoring(Refactoring):
 
     """ Inline variable/method. """
 
-    @staticmethod
-    def get_input_str(refactor, ctx):
-        """ Return user input. """
-
-        return True
-
     @staticmethod
     def get_refactor(ctx):
         """ Function description.
@@ -598,12 +606,6 @@ class UseFunctionRefactoring(Refactoring):
 
     """ Use selected function as possible. """
 
-    @staticmethod
-    def get_input_str(refactor, ctx):
-        """ Return user input. """
-
-        return True
-
     @staticmethod
     def get_refactor(ctx):
         """ Function description.
@@ -630,12 +632,6 @@ class ModuleToPackageRefactoring(Refactoring):
 
     """ Convert module to package. """
 
-    @staticmethod
-    def get_input_str(refactor, ctx):
-        """ Return user input. """
-
-        return True
-
     @staticmethod
     def get_refactor(ctx):
         """ Function description.
@@ -655,6 +651,33 @@ def get_changes(refactor, input_str):
         return refactor.get_changes()
 
 
+class MoveRefactoring(Refactoring):
+
+    """ Move method/module to other class/global. """
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Get destination.
+
+        :return str:
+
+        """
+
+        return pymode_input('Enter destination:')
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = get_assist_params()
+        if offset == 0:
+            offset = None
+        return move.create_move(ctx.project, ctx.resource, offset)
+
+
 def reload_changes(changes):
     """ Reload changed buffers. """
 
@@ -693,3 +716,31 @@ def _get_moved_resources(changes):
         moved[changes.resource] = changes.new_resource
 
     return moved
+
+
+def _get_autoimport_proposals(out, ctx, source, offset, dot=False):
+
+    if not ctx.options.get('autoimport') or dot:
+        return out
+
+    if '.' in codeassist.starting_expression(source, offset):
+        return out
+
+    current_offset = offset - 1
+    while current_offset >= 0 and (
+            source[current_offset].isalnum() or source[current_offset] == '_'):
+        current_offset -= 1
+    starting = source[current_offset:offset]
+    starting = starting.strip()
+
+    if not starting:
+        return out
+
+    for assist in ctx.importer.import_assist(starting):
+        out.append(dict(
+            abbr=' : '.join(assist),
+            word=assist[0],
+            kind='autoimport:',
+        ))
+
+    return out
