Move load_file() from Editor plugin to mainwindow.py

Author: jitseniesen

Diff for: spyder/api/plugins/new_api.py

@@ -968,6 +968,16 @@ def open_file(self, filename):
         """
         raise NotImplementedError
 
+    def get_current_filename(self):
+        """
+        Get the currently displayed file name.
+
+        This applies to plugins that can handle files in a QTabWiget, like
+        the Editor or spyder-notebook.
+        """
+        return None
+
+
 class SpyderDockablePlugin(SpyderPluginV2):
     """
     A Spyder plugin to enhance functionality with a dockable widget.

Diff for: spyder/app/mainwindow.py

@@ -43,11 +43,12 @@
 #==============================================================================
 # Third-party imports
 #==============================================================================
-from qtpy.QtCore import (QCoreApplication, Qt, QTimer, Signal, Slot,
+from qtpy.compat import getopenfilenames
+from qtpy.QtCore import (QCoreApplication, Qt, QDir, QTimer, Signal, Slot,
                          qInstallMessageHandler)
 from qtpy.QtGui import QColor, QKeySequence
 from qtpy.QtWidgets import (
-    QApplication, QMainWindow, QMessageBox, QShortcut, QTabBar)
+    QApplication, QFileDialog, QMainWindow, QMessageBox, QShortcut, QTabBar)
 
 # Avoid a "Cannot mix incompatible Qt library" error on Windows platforms
 from qtpy import QtSvg  # analysis:ignore
@@ -83,7 +84,8 @@
 from spyder.config.gui import is_dark_font_color
 from spyder.config.main import OPEN_FILES_PORT
 from spyder.config.manager import CONF
-from spyder.config.utils import IMPORT_EXT
+from spyder.config.utils import (get_edit_filetypes, get_edit_filters,
+                                 get_filter, IMPORT_EXT)
 from spyder.py3compat import to_text_string
 from spyder.utils import encoding, programs
 from spyder.utils.icon_manager import ima
@@ -871,6 +873,10 @@ def post_visible_setup(self):
         self.get_plugin(Plugins.Application).on_mainwindow_visible()
         QApplication.processEvents()
 
+        # For load_files()
+        self.edit_filetypes = None
+        self.edit_filters = None
+
         # Server to maintain just one Spyder instance and open files in it if
         # the user tries to start other instances with
         # $ spyder foo.py
@@ -1170,6 +1176,83 @@ def redirect_internalshell_stdio(self, state):
             else:
                 console.restore_stds()
 
+    @Slot()
+    def load_files(self):
+        """Load files into Spyder using an 'Open files' dialog."""
+        basedir = getcwd_or_home()
+        if self.edit_filetypes is None:
+            self.edit_filetypes = get_edit_filetypes()
+        if self.edit_filters is None:
+            self.edit_filters = get_edit_filters()
+
+        # Try to get the current filename from plugin that has focus
+        c_fname = None
+        for plugin in (self.widgetlist + self.thirdparty_plugins):
+            if plugin.get_widget().isAncestorOf(self.last_focused_widget):
+                c_fname = plugin.get_current_filename()
+                break
+
+        # If we couldn't get it from them, then use the Editor
+        editor = self.get_plugin(Plugins.Editor, error=False)
+        if c_fname is None and editor:
+            c_fname = editor.get_current_filename()
+
+        # Switch basedir to the current filename one
+        if editor and c_fname != editor.get_widget().TEMPFILE_PATH:
+            basedir = osp.dirname(c_fname)
+
+        # Select filter for the dialog according to c_fname extension
+        if c_fname is not None:
+            selectedfilter = get_filter(self.edit_filetypes,
+                                        osp.splitext(c_fname)[1])
+        else:
+            selectedfilter = ''
+
+        # Open file dialog
+        self.redirect_internalshell_stdio(False)
+        if not running_under_pytest():
+            # See: spyder-ide/spyder#3291
+            if sys.platform == 'darwin':
+                dialog = QFileDialog(
+                    parent=self,
+                    caption=_("Open file"),
+                    directory=basedir,
+                )
+                dialog.setNameFilters(self.edit_filters.split(';;'))
+                dialog.setOption(QFileDialog.HideNameFilterDetails, True)
+                dialog.setFilter(QDir.AllDirs | QDir.Files | QDir.Drives
+                                 | QDir.Hidden)
+                dialog.setFileMode(QFileDialog.ExistingFiles)
+
+                if dialog.exec_():
+                    filenames = dialog.selectedFiles()
+            else:
+                filenames, _sf = getopenfilenames(
+                    self,
+                    _("Open file"),
+                    basedir,
+                    self.edit_filters,
+                    selectedfilter=selectedfilter,
+                    options=QFileDialog.HideNameFilterDetails,
+                )
+        else:
+            # Use a Qt (i.e. scriptable) dialog for pytest
+            dialog = QFileDialog(self, _("Open file"),
+                                 options=QFileDialog.DontUseNativeDialog)
+            if dialog.exec_():
+                filenames = dialog.selectedFiles()
+        self.redirect_internalshell_stdio(True)
+
+        # Normalize returned filenames
+        if filenames:
+            filenames = [osp.normpath(fname) for fname in filenames]
+        else:
+            return
+
+        # Open filenames
+        for fname in filenames:
+            self.open_file(fname)
+
     def open_file(self, fname, external=False):
         """
         Open fname with the appropriate plugin.
@@ -1192,6 +1275,7 @@ def open_file(self, fname, external=False):
                 plugin = self.get_plugin(plugin_name)
                 if ext in plugin.FILE_EXTENSIONS:
                     plugin.open_file(fname)
+                    return
 
         # Open file with the editor, the variable explorer or with
         # an external program

Diff for: spyder/plugins/editor/widgets/main_widget.py

@@ -24,21 +24,18 @@
 import uuid
 
 # Third party imports
-from qtpy.compat import from_qvariant, getopenfilenames, to_qvariant
-from qtpy.QtCore import QByteArray, Qt, Signal, Slot, QDir
+from qtpy.compat import from_qvariant, to_qvariant
+from qtpy.QtCore import QByteArray, Qt, Signal, Slot
 from qtpy.QtGui import QTextCursor
 from qtpy.QtPrintSupport import QAbstractPrintDialog, QPrintDialog, QPrinter
 from qtpy.QtWidgets import (QAction, QActionGroup, QApplication, QDialog,
-                            QFileDialog, QInputDialog, QSplitter,
-                            QVBoxLayout, QWidget)
+                            QInputDialog, QSplitter, QVBoxLayout, QWidget)
 
 # Local imports
 from spyder.api.config.decorators import on_conf_change
 from spyder.api.plugins import Plugins
 from spyder.api.widgets.main_widget import PluginMainWidget
-from spyder.config.base import _, get_conf_path, running_under_pytest
-from spyder.config.utils import (get_edit_filetypes, get_edit_filters,
-                                 get_filter)
+from spyder.config.base import _, get_conf_path
 from spyder.plugins.editor.api.panel import Panel
 from spyder.py3compat import qbytearray_to_str, to_text_string
 from spyder.utils import encoding, programs, sourcecode
@@ -391,7 +388,7 @@ def setup(self):
             text=_("&Open..."),
             icon=self.create_icon('fileopen'),
             tip=_("Open file"),
-            triggered=self.load,
+            triggered=self._plugin.main.load_files,
             context=Qt.WidgetShortcut,
             register_shortcut=True
         )
@@ -1612,7 +1609,7 @@ def register_editorstack(self, editorstack):
         editorstack.text_changed_at.connect(self.text_changed_at)
         editorstack.current_file_changed.connect(self.current_file_changed)
         editorstack.plugin_load.connect(self.load)
-        editorstack.plugin_load[()].connect(self.load)
+        editorstack.plugin_load[()].connect(self._plugin.main.load_files)
         editorstack.edit_goto.connect(self.load)
         editorstack.sig_save_as.connect(self.save_as)
         editorstack.sig_prev_edit_pos.connect(self.go_to_last_edit_location)
@@ -2177,77 +2174,12 @@ def load(self, filenames=None, goto=None, word='',
         except (AttributeError, RuntimeError):
             pass
 
-        editor0 = self.get_current_editor()
-        if editor0 is not None:
-            filename0 = self.get_current_filename()
-        else:
-            filename0 = None
-
         if not filenames:
             # Recent files action
             action = self.sender()
             if isinstance(action, QAction):
                 filenames = from_qvariant(action.data(), to_text_string)
 
-        if not filenames:
-            basedir = getcwd_or_home()
-            if self.edit_filetypes is None:
-                self.edit_filetypes = get_edit_filetypes()
-            if self.edit_filters is None:
-                self.edit_filters = get_edit_filters()
-
-            c_fname = self.get_current_filename()
-            if c_fname is not None and c_fname != self.TEMPFILE_PATH:
-                basedir = osp.dirname(c_fname)
-
-            self.sig_redirect_stdio_requested.emit(False)
-            parent_widget = self.get_current_editorstack()
-            if filename0 is not None:
-                selectedfilter = get_filter(self.edit_filetypes,
-                                            osp.splitext(filename0)[1])
-            else:
-                selectedfilter = ''
-
-            if not running_under_pytest():
-                # See: spyder-ide/spyder#3291
-                if sys.platform == 'darwin':
-                    dialog = QFileDialog(
-                        parent=parent_widget,
-                        caption=_("Open file"),
-                        directory=basedir,
-                    )
-                    dialog.setNameFilters(self.edit_filters.split(';;'))
-                    dialog.setOption(QFileDialog.HideNameFilterDetails, True)
-                    dialog.setFilter(QDir.AllDirs | QDir.Files | QDir.Drives
-                                     | QDir.Hidden)
-                    dialog.setFileMode(QFileDialog.ExistingFiles)
-
-                    if dialog.exec_():
-                        filenames = dialog.selectedFiles()
-                else:
-                    filenames, _sf = getopenfilenames(
-                        parent_widget,
-                        _("Open file"),
-                        basedir,
-                        self.edit_filters,
-                        selectedfilter=selectedfilter,
-                        options=QFileDialog.HideNameFilterDetails,
-                    )
-            else:
-                # Use a Qt (i.e. scriptable) dialog for pytest
-                dialog = QFileDialog(parent_widget, _("Open file"),
-                                     options=QFileDialog.DontUseNativeDialog)
-                if dialog.exec_():
-                    filenames = dialog.selectedFiles()
-
-            self.sig_redirect_stdio_requested.emit(True)
-
-            if filenames:
-                filenames = [osp.normpath(fname) for fname in filenames]
-            else:
-                self.__ignore_cursor_history = cursor_history_state
-                return
-
         focus_widget = QApplication.focusWidget()
         if self.editorwindows and not self.dockwidget.isVisible():
             # We override the editorwindow variable to force a focus on