Commit0d36f06

committed

Fix Autoimport on unsaved file

1 parentb65f669 commit0d36f06Copy full SHA for 0d36f06

File tree

+15

-9

lines changed

+15

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,11 @@ fun! pymode#save() "{{{`
`86`	`86`	`try`
`87`	`87`	`noautocmdwrite`
`88`	`88`	`catch/E212/`
`89`		`-callpymode#error("File modified and I can't save it.Cancel code checking.")`
	`89`	`+callpymode#error("File modified and I can't save it.Please save it manually.")`
`90`	`90`	`return0`
`91`	`91`	`endtry`
`92`	`92`	`endif`
`93`		`-return1`
	`93`	`+returnexpand('%')!=''`
`94`	`94`	`endfunction"}}}`
`95`	`95`
`96`	`96`	`fun!pymode#reload_buf_by_nr(nr)"{{{`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,6 @@ fun! pymode#rope#module_to_package() "{{{`
`161`	`161`	`endfunction"}}}`
`162`	`162`
`163`	`163`	`fun!pymode#rope#autoimport(word)"{{{`
`164`		`-if!pymode#save()`
`165`		`-return0`
`166`		`-endif`
`167`	`164`	`PymodePython rope.autoimport()`
`168`	`165`	`endfunction"}}}`
`169`	`166`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -909,6 +909,13 @@ def complete_check():`
`909`	`909`
`910`	`910`
`911`	`911`	`def_insert_import(name,module,ctx):`
	`912`	`+ifnotctx.resource:`
	`913`	`+source,_=get_assist_params()`
	`914`	`+lineno=ctx.importer.find_insertion_line(source)`
	`915`	`+line='from %s import %s'% (module,name)`
	`916`	`+vim.current.buffer[lineno-1:lineno-1]= [line]`
	`917`	`+returnTrue`
	`918`	`+`
`912`	`919`	`pyobject=ctx.project.pycore.resource_to_pyobject(ctx.resource)`
`913`	`920`	`import_tools=importutils.ImportTools(ctx.project.pycore)`
`914`	`921`	`module_imports=import_tools.module_imports(pyobject)`

Lines changed: 5 additions & 0 deletions

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`letg:pymode_rope_completion_bind='X'`
`2`	`2`	`letg:pymode_rope_autoimport=0`
`3`		`-`
`4`	`3`	`sourceplugin/pymode.vim`
`5`	`4`
`6`	`5`	`describe'pymode-plugin'`
`@@ -15,15 +14,13 @@ describe 'pymode-plugin'`
`15`	`14`	`end`
`16`	`15`
`17`	`16`	`it'pymode rope auto open project in current working directory'`
`18`		`-let project_path=getcwd() .'/.ropeproject'`
	`17`	`+let project_path='.ropeproject'`
`19`	`18`	`Expectisdirectory(project_path)==0`
`20`	`19`	`callpymode#rope#complete(0)`
`21`	`20`	`Expectisdirectory(project_path)==1`
`22`	`21`	`end`
`23`	`22`
`24`	`23`	`it'pymode rope completion'`
`25`		`-source after/ftplugin/python.vim`
`26`		`- Expect &ft=='python'`
`27`	`24`	`normal oimporX`
`28`	`25`	`Expectgetline('.')=='import'`
`29`	`26`	`end`

Comments

(0)