Working on pymode.

klen · klen · commit 40c2c137abcc · 2013-12-01T19:40:37.000+07:00
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -56,6 +56,7 @@ fun! pymode#lint#check() "{{{
     let errors = getqflist()
     if empty(errors)
         call pymode#wide_message('Code checking is completed. No errors found.')
+        return
     endif
 
     if g:pymode_lint_cwindow
diff --git a/autoload/pymode/rope.vim b/autoload/pymode/rope.vim
@@ -139,6 +139,13 @@ fun! pymode#rope#move() "{{{
     PymodePython rope.MoveRefactoring().run()
 endfunction "}}}
 
+fun! pymode#rope#signature() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.ChangeSignatureRefactoring().run()
+endfunction "}}}
+
 fun! pymode#rope#use_function() "{{{
     if !pymode#save()
         return 0
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -397,7 +397,7 @@ Load modules to autoimport by default       *'g:pymode_rope_autoimport_modules'*
 
 Offer to unresolved import object after completion.
 >
-    let g:pymode_rope_autoimport_import_after_complete = 1
+    let g:pymode_rope_autoimport_import_after_complete = 0
 
 
 ------------------------------------------------------------------------------
@@ -441,7 +441,8 @@ Keymap for rename current module            *'g:pymode_rope_rename_module_bind'*
 
 Imports ~
 
-Organize imports in current file (drop unused imports, sort imports)
+Organize imports sorts imports, too. It does that according to PEP8. Unused
+imports will be dropped.
 Keymap                                   *'g:pymode_rope_organize_imports_bind'*
 >
     let g:pymode_rope_organize_imports_bind = '<C-c>ro'
@@ -494,6 +495,10 @@ afterwards.
 >
     let g:pymode_rope_move_bind = '<C-c>rv'
 
+Change function signature ~
+>
+    let g:pymode_rope_change_signature_bind = '<C-c>rs'
+
 
 ------------------------------------------------------------------------------
 4.4 Undo/Redo changes ~
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -137,6 +137,10 @@ if g:pymode_rope
         exe "noremap <silent> <buffer> " . g:pymode_rope_move_bind . " :call pymode#rope#move()<CR>"
     end
 
+    if g:pymode_rope_change_signature_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_change_signature_bind . " :call pymode#rope#signature()<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
@@ -151,8 +151,8 @@ call pymode#default('g:pymode_rope_completion', 1)
 " Enable autoimport used modules
 call pymode#default('g:pymode_rope_autoimport', 1)
 
-" Import object after complete (if that not be imported before)
-call pymode#default('g:pymode_rope_autoimport_import_after_complete', 1)
+" Offer to import object after complete (if that not be imported before)
+call pymode#default('g:pymode_rope_autoimport_import_after_complete', 0)
 
 " Autoimported modules
 call pymode#default('g:pymode_rope_autoimport_modules', ['os', 'shutil', 'datetime'])
@@ -202,6 +202,9 @@ call pymode#default('g:pymode_rope_inline_bind', '<C-c>ri')
 " Move refactoring
 call pymode#default('g:pymode_rope_move_bind', '<C-c>rv')
 
+" Change signature
+call pymode#default('g:pymode_rope_change_signature_bind', '<C-c>rs')
+
 " 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/lint.py b/pymode/lint.py
@@ -1,6 +1,8 @@
 """ Pylama integration. """
 
 import vim # noqa
+from .utils import pymode_message
+
 import os.path
 
 
@@ -24,5 +26,10 @@ def code_check():
     if root:
         path = os.path.relpath(path, root)
 
+    if options.skip and any(p.match(path) for p in options.skip):
+        pymode_message('Skip code checking.')
+        vim.command('return')
+        return False
+
     errors = check_path(path, options=options)
     vim.command('call setqflist(%s)' % json.dumps(errors))
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -21,7 +21,7 @@
 from rope.base import project, libutils, exceptions, change, worder # noqa
 from rope.base.fscommands import FileSystemCommands # noqa
 from rope.contrib import autoimport as rope_autoimport, codeassist, findit # noqa
-from rope.refactor import ModuleToPackage, ImportOrganizer, rename, extract, inline, usefunction, move # noqa
+from rope.refactor import ModuleToPackage, ImportOrganizer, rename, extract, inline, usefunction, move, change_signature # noqa
 from rope.base.taskhandle import TaskHandle # noqa
 
 
@@ -706,6 +706,56 @@ def get_refactor(ctx):
         return move.create_move(ctx.project, ctx.resource, offset)
 
 
+class ChangeSignatureRefactoring(Refactoring):
+
+    """ Change function signature (add/remove/sort arguments). """
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Get destination.
+
+        :return str:
+
+        """
+        args = refactor.get_args()
+        default = ', '.join(a[0] for a in args)
+        return pymode_input('Change the signature:', udefault=default)
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = get_assist_params()
+        return change_signature.ChangeSignature(
+            ctx.project, ctx.resource, offset)
+
+    def get_changes(self, refactor, input_string):
+        """ Function description. """
+
+        args = re.sub(r'[\s\(\)]+', '', input_string).split(',')
+        olds = [arg[0] for arg in refactor.get_args()]
+
+        changers = []
+        for arg in [a for a in olds if not a in args]:
+            changers.append(change_signature.ArgumentRemover(olds.index(arg)))
+            olds.remove(arg)
+
+        order = []
+        for index, arg in enumerate(args):
+            if arg not in olds:
+                changers.append(change_signature.ArgumentAdder(index, arg))
+                olds.insert(index, arg)
+            order.append(olds.index(arg))
+
+        changers.append(change_signature.ArgumentReorderer(
+            order, autodef='None'))
+
+        return refactor.get_changes(changers)
+
+
 def reload_changes(changes):
     """ Reload changed buffers. """
 
