Merge from 3.x: PR #5221

Fixes #5057

Author: ccordoba12

Diff for: spyder/app/mainwindow.py

@@ -2792,6 +2792,7 @@ def open_fileswitcher(self, symbol=False):
             return
         if symbol:
             self.fileswitcher.plugin = self.editor
+            self.fileswitcher.set_search_text('@')
         else:
             self.fileswitcher.set_search_text('')
         self.fileswitcher.show()
@@ -2800,21 +2801,16 @@ def open_fileswitcher(self, symbol=False):
     def open_symbolfinder(self):
         """Open symbol list management dialog box."""
         self.open_fileswitcher(symbol=True)
-        self.fileswitcher.set_search_text('@')
-        self.fileswitcher.setup()
 
     def add_to_fileswitcher(self, plugin, tabs, data, icon):
         """Add a plugin to the File Switcher."""
         if self.fileswitcher is None:
             self.fileswitcher = FileSwitcher(self, plugin, tabs, data, icon)
-            self.fileswitcher.sig_goto_file.connect(
-                    plugin.get_current_tab_manager().set_stack_index
-                )
         else:
             self.fileswitcher.add_plugin(plugin, tabs, data, icon)
-            self.fileswitcher.sig_goto_file.connect(
-                    plugin.get_current_tab_manager().set_stack_index
-                )
+
+        self.fileswitcher.sig_goto_file.connect(
+                plugin.get_current_tab_manager().set_stack_index)
 
     # ---- Check for Spyder Updates
     def _check_updates_ready(self):

Diff for: spyder/plugins/editor.py

@@ -1328,10 +1328,17 @@ def save_focus_editorstack(self):
                 if win.isAncestorOf(editorstack):
                     self.set_last_focus_editorstack(win, editorstack)
 
-    #------ Handling editorstacks
+    # ------ Handling editorstacks
     def register_editorstack(self, editorstack):
         self.editorstacks.append(editorstack)
         self.register_widget_shortcuts(editorstack)
+        if len(self.editorstacks) > 1 and self.main is not None:
+            # The first editostack is registered automatically with Spyder's
+            # main window through the `register_plugin` method. Only additional
+            # editors added by splitting need to be registered.
+            # See Issue #5057.
+            self.main.fileswitcher.sig_goto_file.connect(
+                      editorstack.set_stack_index)
 
         if self.isAncestorOf(editorstack):
             # editorstack is a child of the Editor plugin
@@ -2422,11 +2429,11 @@ def go_to_next_cursor_position(self):
         self.__move_cursor_position(1)
 
     @Slot()
-    def go_to_line(self):
+    def go_to_line(self, line=None):
         """Open 'go to line' dialog"""
         editorstack = self.get_current_editorstack()
         if editorstack is not None:
-            editorstack.go_to_line()
+            editorstack.go_to_line(line)
 
     @Slot()
     def set_or_clear_breakpoint(self):

Diff for: spyder/utils/editor.py

@@ -131,6 +131,7 @@ def goto_line(self, line, column=0, move=True, word=''):
         :return: The new text cursor
         :rtype: QtGui.QTextCursor
         """
+        line = min(line, self.line_count())
         text_cursor = self._move_cursor_to(line)
         if column:
             text_cursor.movePosition(text_cursor.Right, text_cursor.MoveAnchor,

Diff for: spyder/widgets/editor.py

@@ -851,10 +851,15 @@ def get_current_tab_manager(self):
         """Get the widget with the TabWidget attribute."""
         return self
 
-    def go_to_line(self):
+    def go_to_line(self, line=None):
         """Go to line dialog"""
-        if self.data:
-            self.get_current_editor().exec_gotolinedialog()
+        if line is not None:
+            # When this method is called from the flileswitcher, a line
+            # number is specified, so there is no need for the dialog.
+            self.get_current_editor().go_to_line(line)
+        else:
+            if self.data:
+                self.get_current_editor().exec_gotolinedialog()
 
     def set_or_clear_breakpoint(self):
         """Set/clear breakpoint"""

Diff for: spyder/widgets/fileswitcher.py

@@ -295,7 +295,8 @@ def __init__(self, parent, plugin, tabs, data, icon):
     @property
     def widgets(self):
         widgets = []
-        for tabs, plugin in self.plugins_tabs:
+        for plugin in self.plugins_instances:
+            tabs = self.get_plugin_tabwidget(plugin)
             widgets += [(tabs.widget(index), plugin) for
                         index in range(tabs.count())]
         return widgets
@@ -321,14 +322,16 @@ def save_status(self):
     @property
     def paths(self):
         paths = []
-        for da, icon in self.plugins_data:
+        for plugin in self.plugins_instances:
+            da = self.get_plugin_data(plugin)
             paths += [getattr(td, 'filename', None) for td in da]
         return paths
 
     @property
     def filenames(self):
         filenames = []
-        for da, icon in self.plugins_data:
+        for plugin in self.plugins_instances:
+            da = self.get_plugin_data(plugin)
             filenames += [os.path.basename(getattr(td,
                                                    'filename',
                                                    None)) for td in da]
@@ -526,18 +529,37 @@ def get_stack_index(self, stack_index, plugin_index):
         return real_index
 
     # --- Helper methods: Widget
+    def get_plugin_data(self, plugin):
+        """Get the data object of the plugin's current tab manager."""
+        # The data object is named "data" in the editor plugin while it is
+        # named "clients" in the notebook plugin.
+        try:
+            data = plugin.get_current_tab_manager().data
+        except AttributeError:
+            data = plugin.get_current_tab_manager().clients
+
+        return data
+
+    def get_plugin_tabwidget(self, plugin):
+        """Get the tabwidget of the plugin's current tab manager."""
+        # The tab widget is named "tabs" in the editor plugin while it is
+        # named "tabwidget" in the notebook plugin.
+        try:
+            tabwidget = plugin.get_current_tab_manager().tabs
+        except AttributeError:
+            tabwidget = plugin.get_current_tab_manager().tabwidget
+
+        return tabwidget
+
     def get_widget(self, index=None, path=None, tabs=None):
         """Get widget by index.
-        
+
         If no tabs and index specified the current active widget is returned.
         """
-        if index and tabs:
-            return tabs.widget(index)
-        elif path and tabs:
+        if (index and tabs) or (path and tabs):
             return tabs.widget(index)
         elif self.plugin:
-            index = self.plugins_instances.index(self.plugin)
-            return self.plugins_tabs[index][0].currentWidget()
+            return self.get_plugin_tabwidget(self.plugin).currentWidget()
         else:
             return self.plugins_tabs[0][0].currentWidget()
 
@@ -558,9 +580,8 @@ def goto_line(self, line_number):
         """Go to specified line number in current active editor."""
         if line_number:
             line_number = int(line_number)
-            editor = self.get_widget()
             try:
-                editor.go_to_line(min(line_number, editor.get_line_count()))
+                self.plugin.go_to_line(line_number)
             except AttributeError:
                 pass
 
@@ -616,6 +637,8 @@ def setup_file_list(self, filter_text, current_path):
         # Get optional line number
         if trying_for_line_number:
             filter_text, line_number = filter_text.split(':')
+            if line_number == '':
+                line_number = None
             # Get all the available filenames
             scores = get_search_scores('', self.filenames,
                                        template="<b>{0}</b>")
@@ -626,7 +649,6 @@ def setup_file_list(self, filter_text, current_path):
             scores = get_search_scores(filter_text, self.filenames,
                                        template="<b>{0}</b>")
 
-
         # Get max width to determine if shortpaths should be used
         max_width = self.get_item_size(paths)[0]
         self.fix_size(paths)