tab.open_file and new arg line

CHANGELOG.md

@@ -5,6 +5,8 @@
 * Find usages contains symbol name in the dialog title
 * Jump to definition contains symbol name in the dialog title
 * Show documentation contains symbol name in the dialog title
+* `tab.open_file` has new `line` argument
+    * Jump to definition, Find usages utilizes `tab.open_file` instead of `editor`'s one
 
 
 ## 1.0.2 (2017-10-01)

blackmamba/ide/tab.py

@@ -1,7 +1,8 @@
 #!python3
 
 from objc_util import on_main_thread, ObjCClass, sel
-
+import blackmamba.ide.source as source
+import ui
 
 _PASlidingContainerViewController = ObjCClass('PASlidingContainerViewController')
 _PA2UniversalTextEditorViewController = ObjCClass('PA2UniversalTextEditorViewController')
@@ -177,7 +178,7 @@ def get_paths():
     return [str(tab.filePath()) for tab in tabs.tabViewControllers()]
 
 
-def open_file(path, new_tab=True):
+def open_file(path, new_tab=True, line=None):
     index = None
     paths = get_paths()
 
@@ -192,3 +193,8 @@ def open_file(path, new_tab=True):
         editor.open_file(path, new_tab=new_tab)
     else:
         select_tab(index)
+
+    if line is not None:
+        def scroll():
+            source.scroll_to_line(line)
+        ui.delay(scroll, 0.2)

blackmamba/script/find_usages.py

@@ -20,16 +20,6 @@
 import blackmamba.ide.source as source
 
 
-def _open_and_scroll(path, line):
-    if editor.get_path() == path:
-        source.scroll_to_line(line)
-    else:
-        def scroll():
-            source.scroll_to_line(line)
-        editor.open_file(path, new_tab=True)
-        ui.delay(scroll, 0.2)
-
-
 class LocationPickerItem(PickerItem):
     def __init__(self, path, line, display_folder):
         super().__init__(
@@ -75,7 +65,7 @@ def __init__(self, definitions):
 
 def _select_location(definitions):
     def open_location(item, shift_enter):
-        _open_and_scroll(item.path, item.line)
+        tab.open_file(item.path, line=item.line)
 
     v = PickerView()
     v.name = '{} usages'.format(definitions[0].name)

blackmamba/script/jump_to_definition.py

@@ -21,16 +21,6 @@
 import blackmamba.ide.tab as tab
 
 
-def _open_and_scroll(path, line):
-    if editor.get_path() == path:
-        source.scroll_to_line(line)
-    else:
-        def scroll():
-            source.scroll_to_line(line)
-        tab.open_file(path, new_tab=True)
-        ui.delay(scroll, 0.2)
-
-
 class LocationPickerItem(PickerItem):
     def __init__(self, path, line, display_folder, definition):
         super().__init__(
@@ -77,7 +67,7 @@ def __init__(self, definitions):
 def _select_location(definitions):
     def open_location(item, shift_enter):
         definition = item.definition
-        _open_and_scroll(definition.module_path, definition.line)
+        tab.open_file(definition.module_path, line=definition.line)
 
     v = PickerView()
     v.name = '{} definitions'.format(definitions[0].name)
@@ -130,7 +120,7 @@ def main():
         return
 
     if len(definitions) == 1:
-        _open_and_scroll(definitions[0].module_path, definitions[0].line)
+        tab.open_file(definitions[0].module_path, line=definitions[0].line)
     else:
         _select_location(definitions)