Migrate Outline explorer, plots, preferences and profiler to use the …

…new teardown mechanism

spyder/plugins/maininterpreter/plugin.py

@@ -17,7 +17,8 @@
 
 # Local imports
 from spyder.api.plugins import Plugins, SpyderPluginV2
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.api.translations import get_translation
 from spyder.plugins.maininterpreter.confpage import MainInterpreterConfigPage
 from spyder.plugins.maininterpreter.container import MainInterpreterContainer
@@ -90,6 +91,19 @@ def on_statusbar_available(self):
         if statusbar:
             statusbar.add_status_widget(self.interpreter_status)
 
+    @on_plugin_teardown(plugin=Plugins.Preferences)
+    def on_preferences_teardown(self):
+        # Deregister conf page
+        preferences = self.get_plugin(Plugins.Preferences)
+        preferences.deregister_plugin_preferences(self)
+
+    @on_plugin_teardown(plugin=Plugins.StatusBar)
+    def on_statusbar_teardown(self):
+        # Add status widget
+        statusbar = self.get_plugin(Plugins.StatusBar)
+        if statusbar:
+            statusbar.remove_status_widget(self.interpreter_status.ID)
+
     # ---- Public API
     def get_interpreter(self):
         """Get current interpreter."""

spyder/plugins/outlineexplorer/plugin.py

@@ -11,7 +11,8 @@
 from qtpy.QtWidgets import QVBoxLayout
 
 # Local imports
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.api.translations import get_translation
 from spyder.api.plugins import SpyderDockablePlugin, Plugins
 from spyder.py3compat import is_text_string
@@ -59,6 +60,15 @@ def on_completions_available(self):
         completions.sig_stop_completions.connect(
             self.stop_symbol_services)
 
+    @on_plugin_teardown(plugin=Plugins.Completions)
+    def on_completions_teardown(self):
+        completions = self.get_plugin(Plugins.Completions)
+
+        completions.sig_language_completions_available.disconnect(
+            self.start_symbol_services)
+        completions.sig_stop_completions.disconnect(
+            self.stop_symbol_services)
+
     #------ Public API ---------------------------------------------------------
     def restore_scrollbar_position(self):
         """Restoring scrollbar position after main window is visible"""

spyder/plugins/plots/plugin.py

@@ -13,7 +13,8 @@
 
 # Local imports
 from spyder.api.plugins import Plugins, SpyderDockablePlugin
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.api.translations import get_translation
 from spyder.plugins.plots.widgets.main_widget import PlotsWidget
 
@@ -62,14 +63,16 @@ def on_ipython_console_available(self):
         ipyconsole.sig_shellwidget_deleted.connect(
             self.remove_shellwidget)
 
-    def unregister(self):
+    @on_plugin_teardown(plugin=Plugins.IPythonConsole)
+    def on_ipython_console_teardown(self):
         # Plugins
         ipyconsole = self.get_plugin(Plugins.IPythonConsole)
 
         # Signals
+        ipyconsole.sig_shellwidget_changed.disconnect(self.set_shellwidget)
         ipyconsole.sig_shellwidget_created.disconnect(
             self.add_shellwidget)
-        ipyconsole.sig_shellwidget_deleted.connect(
+        ipyconsole.sig_shellwidget_deleted.disconnect(
             self.remove_shellwidget)
 
     def switch_to_plugin(self, force_focus=False):

spyder/plugins/preferences/plugin.py

@@ -22,7 +22,8 @@
 
 # Local imports
 from spyder.api.plugins import Plugins, SpyderPluginV2, SpyderPlugin
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.config.base import _
 from spyder.config.main import CONF_VERSION
 from spyder.config.user import NoDefault
@@ -295,9 +296,30 @@ def on_toolbar_available(self):
             section=MainToolbarSections.ApplicationSection
         )
 
-    def unregister(self):
-        pass
+    @on_plugin_teardown(plugin=Plugins.MainMenu)
+    def on_main_menu_teardown(self):
+        container = self.get_container()
+        main_menu = self.get_plugin(Plugins.MainMenu)
+
+        main_menu.remove_item_from_application_menu(
+            container.show_action,
+            menu_id=ApplicationMenus.Tools,
+        )
+
+        main_menu.remove_item_from_application_menu(
+            container.reset_action,
+            menu_id=ApplicationMenus.Tools,
+        )
+
+    @on_plugin_teardown(plugin=Plugins.Toolbar)
+    def on_toolbar_teardown(self):
+        container = self.get_container()
+        toolbar = self.get_plugin(Plugins.Toolbar)
+        toolbar.remove_item_from_application_toolbar(
+            container.show_action,
+            toolbar_id=ApplicationToolbars.Main
+        )
 
-    def on_close(self, cancelable=False) -> bool:
+    def can_close(self) -> bool:
         container = self.get_container()
         return not container.is_dialog_open()

spyder/plugins/profiler/plugin.py

@@ -16,7 +16,8 @@
 
 # Local imports
 from spyder.api.plugins import Plugins, SpyderDockablePlugin
-from spyder.api.plugin_registration.decorators import on_plugin_available
+from spyder.api.plugin_registration.decorators import (
+    on_plugin_available, on_plugin_teardown)
 from spyder.api.translations import get_translation
 from spyder.plugins.mainmenu.api import ApplicationMenus
 from spyder.plugins.profiler.confpage import ProfilerConfigPage
@@ -105,6 +106,25 @@ def on_main_menu_available(self):
         run_menu = mainmenu.get_application_menu(ApplicationMenus.Run)
         mainmenu.add_item_to_application_menu(run_action, menu=run_menu)
 
+    @on_plugin_teardown(plugin=Plugins.Editor)
+    def on_editor_teardown(self):
+        widget = self.get_widget()
+        editor = self.get_plugin(Plugins.Editor)
+        widget.sig_edit_goto_requested.disconnect(editor.load)
+
+    @on_plugin_teardown(plugin=Plugins.Preferences)
+    def on_preferences_teardown(self):
+        preferences = self.get_plugin(Plugins.Preferences)
+        preferences.deregister_plugin_preferences(self)
+
+    @on_plugin_teardown(plugin=Plugins.MainMenu)
+    def on_main_menu_teardown(self):
+        mainmenu = self.get_plugin(Plugins.MainMenu)
+        run_action = self.get_action(ProfilerActions.ProfileCurrentFile)
+
+        run_menu = mainmenu.get_application_menu(ApplicationMenus.Run)
+        mainmenu.remove_item_from_application_menu(run_action, menu=run_menu)
+
     # --- Public API
     # ------------------------------------------------------------------------
     def run_profiler(self):