changed keys back

JulianEberius · Jun 17, 2010 · 10d1fe0 · 10d1fe0
1 parent 46bd5c5
commit 10d1fe0
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/Commands/Autocomplete.tmCommand b/Commands/Autocomplete.tmCommand
@@ -10,11 +10,11 @@
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>
-	<string>~ </string>
+	<string>^ </string>
 	<key>name</key>
 	<string>Autocomplete</string>
 	<key>output</key>
-	<string>afterSelectedText</string>
+	<string>discard</string>
 	<key>scope</key>
 	<string>source.python</string>
 	<key>uuid</key>

diff --git a/Commands/Find Imports.tmCommand b/Commands/Find Imports.tmCommand
@@ -10,7 +10,7 @@
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>
-	<string>@|</string>
+	<string>@I</string>
 	<key>name</key>
 	<string>Find possible Imports</string>
 	<key>output</key>

diff --git a/Commands/Go to definition.tmCommand b/Commands/Go to definition.tmCommand
@@ -15,7 +15,7 @@ fi
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>
-	<string>@D</string>
+	<string>~ </string>
 	<key>name</key>
 	<string>Go to definition</string>
 	<key>output</key>

diff --git a/Commands/Local To Field.tmCommand b/Commands/Local To Field.tmCommand
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>beforeRunningCommand</key>
+	<string>saveActiveFile</string>
+	<key>command</key>
+	<string>refactor.py local_to_field</string>
+	<key>input</key>
+	<string>document</string>
+	<key>keyEquivalent</key>
+	<string>@</string>
+	<key>name</key>
+	<string>Local To Field</string>
+	<key>output</key>
+	<string>replaceDocument</string>
+	<key>scope</key>
+	<string>source.python</string>
+	<key>uuid</key>
+	<string>D40BBBDD-2EDF-41A7-8B00-16E4442FCE4D</string>
+</dict>
+</plist>
diff --git a/Commands/Organize Imports.tmCommand b/Commands/Organize Imports.tmCommand
@@ -9,7 +9,7 @@
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>
-	<string>^|</string>
+	<string>@O</string>
 	<key>name</key>
 	<string>Organize Imports</string>
 	<key>output</key>

diff --git a/Commands/Rename.tmCommand b/Commands/Rename.tmCommand
@@ -9,7 +9,7 @@
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>
-	<string>^~@r</string>
+	<string>@</string>
 	<key>name</key>
 	<string>Rename</string>
 	<key>output</key>

diff --git a/Support/bin/refactor.py b/Support/bin/refactor.py
@@ -195,7 +195,7 @@ def __init__(self, name, module):
 
 def find_imports():
     def find_last_import_line(lines):
-        x = 0
+        x = -1
         for i in range(len(lines)):
             l = lines[i]
             if l.startswith("from") or l.startswith("import"):
@@ -231,7 +231,7 @@ def find_last_import_line(lines):
                     try: 
                         import_from_mod_name = re.search(r'module = "(.*)";', out).group(1)
                     except:
-                        import_from_mod_name = re.search(r'module = ".*";', out).group(1)
+                        import_from_mod_name = re.search(r'module = (.*);', out).group(1)
                     try:
                         import_name = re.search(r'match = "(.*)";', out).group(1)
                     except: