Fix rope

klen · klen · commit 6c275a524048 · 2011-10-15T20:21:42.000+04:00
diff --git a/after/plugin/pymode_breakpoint.vim b/after/plugin/pymode_breakpoint.vim
@@ -21,9 +21,7 @@ fun! pymode_breakpoint#Set(lnum) "{{{
     endif
 
     let plnum = prevnonblank(a:lnum)
-    let indent = indent(plnum)
-
-    call append(line('.') - 1, repeat(' ', indent) . import)
+    call append(line('.') - 1, repeat(' ', indent(plnum)) . import)
     normal k
 
 endfunction "}}}
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -47,9 +47,8 @@ if g:pymode_rope
     noremap <silent> <buffer> <C-c>d :call RopeShowDoc()<CR>
     noremap <silent> <buffer> <C-c>f :call RopeFindOccurences()<CR>
     noremap <silent> <buffer> <C-c>m :emenu Rope.<TAB>
-    inoremap <silent> <buffer> <C-Space> <C-R>=RopeCodeAssistInsertMode()<CR>
     inoremap <silent> <buffer> <Nul> <C-R>=RopeCodeAssistInsertMode()<CR>
-    inoremap <silent> <buffer> <C-?> <C-R>=RopeLuckyAssistInsertMode()<CR>
+    inoremap <silent> <buffer> <S-TAB> <C-R>=RopeLuckyAssistInsertMode()<CR>
 
 endif
 
diff --git a/pylibs/ropemode/interface.py b/pylibs/ropemode/interface.py
@@ -289,20 +289,13 @@ def _check_autoimport(self):
             return False
         return True
 
-    @decorators.global_command()
+    @decorators.global_command('g')
     def generate_autoimport_cache(self):
+
         if not self._check_autoimport():
             return
+
         modules = self.env.get('autoimport_modules')
-        modnames = []
-        if modules:
-            for i in range(len(modules)):
-                modname = modules[i]
-                if not isinstance(modname, basestring):
-                    modname = modname.value()
-                modnames.append(modname)
-        else:
-            modules = []
 
         def gen(handle):
             self.autoimport.generate_cache(task_handle=handle)
diff --git a/pylibs/ropemode/refactor.py b/pylibs/ropemode/refactor.py
@@ -507,6 +507,7 @@ def _resources(project, text):
 def runtask(env, command, name, interrupts=True):
     return RunTask(env, command, name, interrupts)()
 
+
 class RunTask(object):
 
     def __init__(self, env, task, name, interrupts=True):
@@ -518,12 +519,14 @@ def __init__(self, env, task, name, interrupts=True):
     def __call__(self):
         handle = taskhandle.TaskHandle(name=self.name)
         progress = self.env.create_progress(self.name)
+
         def update_progress():
             jobset = handle.current_jobset()
             if jobset:
                 percent = jobset.get_percent_done()
                 if percent is not None:
                     progress.update(percent)
+
         handle.add_observer(update_progress)
         result = self.task(handle)
         progress.done()
diff --git a/pylibs/ropevim.py b/pylibs/ropevim.py
@@ -364,7 +364,8 @@ def done(self):
 def echo(message):
     if isinstance(message, unicode):
         message = message.encode(vim.eval('&encoding'))
-    print message
+    vim.command('redraw')
+    vim.command('echon "%s"' % message)
 
 
 def call(command):
