Fix Autoimport on unsaved file

klen · klen · commit 0d36f0658756 · 2013-12-02T16:24:35.000+07:00
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -86,11 +86,11 @@ fun! pymode#save() "{{{
         try
             noautocmd write
         catch /E212/
-            call pymode#error("File modified and I can't save it. Cancel code checking.")
+            call pymode#error("File modified and I can't save it. Please save it manually.")
             return 0
         endtry
     endif
-    return 1
+    return expand('%') != ''
 endfunction "}}}
 
 fun! pymode#reload_buf_by_nr(nr) "{{{
diff --git a/autoload/pymode/rope.vim b/autoload/pymode/rope.vim
@@ -161,9 +161,6 @@ fun! pymode#rope#module_to_package() "{{{
 endfunction "}}}
 
 fun! pymode#rope#autoimport(word) "{{{
-    if !pymode#save()
-        return 0
-    endif
     PymodePython rope.autoimport()
 endfunction "}}}
 
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -909,6 +909,13 @@ def complete_check():
 
 
 def _insert_import(name, module, ctx):
+    if not ctx.resource:
+        source, _ = get_assist_params()
+        lineno = ctx.importer.find_insertion_line(source)
+        line = 'from %s import %s' % (module, name)
+        vim.current.buffer[lineno - 1:lineno - 1] = [line]
+        return True
+
     pyobject = ctx.project.pycore.resource_to_pyobject(ctx.resource)
     import_tools = importutils.ImportTools(ctx.project.pycore)
     module_imports = import_tools.module_imports(pyobject)
diff --git a/t/plugin.vim b/t/plugin.vim
@@ -27,6 +27,11 @@ describe 'pymode-plugin'
         Expect getline('$') == 'test success'
     end
 
+    it 'pymode save'
+        Expect expand('%') == ''
+        Expect pymode#save() == 0
+    end
+
 end
 
 
diff --git a/t/rope.vim b/t/rope.vim
@@ -1,6 +1,5 @@
 let g:pymode_rope_completion_bind = 'X'
 let g:pymode_rope_autoimport = 0
-
 source  plugin/pymode.vim 
 
 describe 'pymode-plugin'
@@ -15,15 +14,13 @@ describe 'pymode-plugin'
     end
 
     it 'pymode rope auto open project in current working directory'
-        let project_path = getcwd() . '/.ropeproject'
+        let project_path = '.ropeproject'
         Expect isdirectory(project_path)  == 0
         call pymode#rope#complete(0)
         Expect isdirectory(project_path)  == 1
     end
 
     it 'pymode rope completion'
-        source  after/ftplugin/python.vim 
-        Expect &ft == 'python'
         normal oimporX
         Expect getline('.') == 'import'
     end
