improved add import behaviour: stay on same line

esteele · Oct 13, 2010 · 8ba07b3 · 8ba07b3
1 parent e41cf3a
commit 8ba07b3
Show file tree

Hide file tree

Showing 59 changed files with 12 additions and 6 deletions.
diff --git a/Commands/Find Imports.tmCommand b/Commands/Find Imports.tmCommand
@@ -3,10 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>beforeRunningCommand</key>
-	<string>nop</string>
+	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>refactor.py find_imports
-</string>
+	<string>in=`cat -`
+out=`echo "$in" | refactor.py find_imports`
+
+if [ "$in" != "$out" ]
+then
+	open "txmt://open/?line=$(($TM_LINE_NUMBER + 1))&amp;column=4"
+fi
+
+echo "$out"</string>
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>

diff --git a/Support/bin/refactor.py b/Support/bin/refactor.py
@@ -217,7 +217,7 @@ def find_last_import_line(lines):
             try:
                 proposals = complete_import(context.project, context.resource, context.input, offset)
                 if len(proposals) == 0:
-                    tooltip("No completions found!")
+                    #tooltip("No completions found!")
                     return context.input
                 else:
                     register_completion_images()
@@ -249,7 +249,7 @@ def find_last_import_line(lines):
                     lines = code.split("\n")
                     idx = find_last_import_line(lines)
                     new_line = "from "+import_from_mod_name+" import "+import_name
-                    tooltip("Added \""+new_line+"\"at line "+str(idx+2))
+                    #tooltip("Added \""+new_line+"\"at line "+str(idx+2))
                     lines = lines[:idx+1]+[new_line]+lines[idx+1:]
                     result = "\n".join(lines)
             except Exception, e:

diff --git a/Support/lib/rope/__init__.pyc b/Support/lib/rope/__init__.pyc
diff --git a/Support/lib/rope/base/__init__.pyc b/Support/lib/rope/base/__init__.pyc
diff --git a/Support/lib/rope/base/arguments.pyc b/Support/lib/rope/base/arguments.pyc
diff --git a/Support/lib/rope/base/ast.pyc b/Support/lib/rope/base/ast.pyc
diff --git a/Support/lib/rope/base/astutils.pyc b/Support/lib/rope/base/astutils.pyc
diff --git a/Support/lib/rope/base/builtins.pyc b/Support/lib/rope/base/builtins.pyc
diff --git a/Support/lib/rope/base/change.pyc b/Support/lib/rope/base/change.pyc
diff --git a/Support/lib/rope/base/codeanalyze.pyc b/Support/lib/rope/base/codeanalyze.pyc
diff --git a/Support/lib/rope/base/evaluate.pyc b/Support/lib/rope/base/evaluate.pyc
diff --git a/Support/lib/rope/base/exceptions.pyc b/Support/lib/rope/base/exceptions.pyc
diff --git a/Support/lib/rope/base/fscommands.pyc b/Support/lib/rope/base/fscommands.pyc
diff --git a/Support/lib/rope/base/history.pyc b/Support/lib/rope/base/history.pyc
diff --git a/Support/lib/rope/base/libutils.pyc b/Support/lib/rope/base/libutils.pyc
diff --git a/Support/lib/rope/base/oi/__init__.pyc b/Support/lib/rope/base/oi/__init__.pyc
diff --git a/Support/lib/rope/base/oi/doa.pyc b/Support/lib/rope/base/oi/doa.pyc
diff --git a/Support/lib/rope/base/oi/memorydb.pyc b/Support/lib/rope/base/oi/memorydb.pyc
diff --git a/Support/lib/rope/base/oi/objectdb.pyc b/Support/lib/rope/base/oi/objectdb.pyc
diff --git a/Support/lib/rope/base/oi/objectinfo.pyc b/Support/lib/rope/base/oi/objectinfo.pyc
diff --git a/Support/lib/rope/base/oi/soa.pyc b/Support/lib/rope/base/oi/soa.pyc
diff --git a/Support/lib/rope/base/oi/soi.pyc b/Support/lib/rope/base/oi/soi.pyc
diff --git a/Support/lib/rope/base/oi/transform.pyc b/Support/lib/rope/base/oi/transform.pyc
diff --git a/Support/lib/rope/base/prefs.pyc b/Support/lib/rope/base/prefs.pyc
diff --git a/Support/lib/rope/base/project.pyc b/Support/lib/rope/base/project.pyc
diff --git a/Support/lib/rope/base/pycore.pyc b/Support/lib/rope/base/pycore.pyc
diff --git a/Support/lib/rope/base/pynames.pyc b/Support/lib/rope/base/pynames.pyc
diff --git a/Support/lib/rope/base/pynamesdef.pyc b/Support/lib/rope/base/pynamesdef.pyc
diff --git a/Support/lib/rope/base/pyobjects.pyc b/Support/lib/rope/base/pyobjects.pyc
diff --git a/Support/lib/rope/base/pyobjectsdef.pyc b/Support/lib/rope/base/pyobjectsdef.pyc
diff --git a/Support/lib/rope/base/pyscopes.pyc b/Support/lib/rope/base/pyscopes.pyc
diff --git a/Support/lib/rope/base/resourceobserver.pyc b/Support/lib/rope/base/resourceobserver.pyc
diff --git a/Support/lib/rope/base/resources.pyc b/Support/lib/rope/base/resources.pyc
diff --git a/Support/lib/rope/base/simplify.pyc b/Support/lib/rope/base/simplify.pyc
diff --git a/Support/lib/rope/base/stdmods.pyc b/Support/lib/rope/base/stdmods.pyc
diff --git a/Support/lib/rope/base/taskhandle.pyc b/Support/lib/rope/base/taskhandle.pyc
diff --git a/Support/lib/rope/base/utils.pyc b/Support/lib/rope/base/utils.pyc
diff --git a/Support/lib/rope/base/worder.pyc b/Support/lib/rope/base/worder.pyc
diff --git a/Support/lib/rope/contrib/__init__.pyc b/Support/lib/rope/contrib/__init__.pyc
diff --git a/Support/lib/rope/contrib/codeassist.pyc b/Support/lib/rope/contrib/codeassist.pyc
diff --git a/Support/lib/rope/contrib/fixsyntax.pyc b/Support/lib/rope/contrib/fixsyntax.pyc
diff --git a/Support/lib/rope/refactor/__init__.pyc b/Support/lib/rope/refactor/__init__.pyc
diff --git a/Support/lib/rope/refactor/extract.pyc b/Support/lib/rope/refactor/extract.pyc
diff --git a/Support/lib/rope/refactor/functionutils.pyc b/Support/lib/rope/refactor/functionutils.pyc
diff --git a/Support/lib/rope/refactor/importutils/__init__.pyc b/Support/lib/rope/refactor/importutils/__init__.pyc
diff --git a/Support/lib/rope/refactor/importutils/actions.pyc b/Support/lib/rope/refactor/importutils/actions.pyc
diff --git a/Support/lib/rope/refactor/importutils/importinfo.pyc b/Support/lib/rope/refactor/importutils/importinfo.pyc
diff --git a/Support/lib/rope/refactor/importutils/module_imports.pyc b/Support/lib/rope/refactor/importutils/module_imports.pyc
diff --git a/Support/lib/rope/refactor/occurrences.pyc b/Support/lib/rope/refactor/occurrences.pyc
diff --git a/Support/lib/rope/refactor/patchedast.pyc b/Support/lib/rope/refactor/patchedast.pyc
diff --git a/Support/lib/rope/refactor/rename.pyc b/Support/lib/rope/refactor/rename.pyc
diff --git a/Support/lib/rope/refactor/restructure.pyc b/Support/lib/rope/refactor/restructure.pyc
diff --git a/Support/lib/rope/refactor/similarfinder.pyc b/Support/lib/rope/refactor/similarfinder.pyc
diff --git a/Support/lib/rope/refactor/sourceutils.pyc b/Support/lib/rope/refactor/sourceutils.pyc
diff --git a/Support/lib/rope/refactor/suites.pyc b/Support/lib/rope/refactor/suites.pyc
diff --git a/Support/lib/rope/refactor/topackage.pyc b/Support/lib/rope/refactor/topackage.pyc
diff --git a/Support/lib/rope/refactor/usefunction.pyc b/Support/lib/rope/refactor/usefunction.pyc
diff --git a/Support/lib/rope/refactor/wildcards.pyc b/Support/lib/rope/refactor/wildcards.pyc
diff --git a/info.plist b/info.plist
@@ -11,7 +11,6 @@
 		<string>D40BBBDD-2EDF-41A7-8B00-16E4442FCE4D</string>
 		<string>1D82239A-E8AE-48A8-9653-BC7F2AD6D8CC</string>
 		<string>21AFB944-D812-48D9-B3C2-23743840CA6F</string>
-		<string>60BA84AA-EDE8-41A5-9EB4-FB34B1E2A36C</string>
 		<string>DE9FF600-B7C9-4F80-AA5F-BC73A7BD07F4</string>
 	</array>
 	<key>uuid</key>