Merge pull request #19492 from impact27/merge_breakpoint_plugin

PR: Merge Breakpoints and Debugger plugins

changelogs/Spyder-6.md

@@ -29,6 +29,8 @@
   `Preferences > Appearance`
 * Files can be opened in the editor by pasting their path in the Working
   Directory toolbar.
+* Add a new button to the Variable Explorer to indicate when variables are being
+  filtered.
 
 ### New API features
 
@@ -39,8 +41,9 @@
 * Generalize the Run plugin to support generic inputs and executors. This allows
   plugins to declare what kind of inputs (i.e. file, cell or selection) they
   can execute and how they will display the result.
-* Add a new plugin called `Switcher` for the files and symbols switcher.
+* Add a new plugin called Switcher for the files and symbols switcher.
 * Declare a proper API for the Projects plugin.
+* Remove the Breakpoints plugin and add its functionality to the Debugger one.
 
 ----
 

setup.py

@@ -281,7 +281,6 @@ def run(self):
 spyder_plugins_entry_points = [
     'appearance = spyder.plugins.appearance.plugin:Appearance',
     'application = spyder.plugins.application.plugin:Application',
-    'breakpoints = spyder.plugins.breakpoints.plugin:Breakpoints',
     'completions = spyder.plugins.completion.plugin:CompletionPlugin',
     'debugger = spyder.plugins.debugger.plugin:Debugger',
     'editor = spyder.plugins.editor.plugin:Editor',

spyder/api/plugins/enum.py

@@ -14,7 +14,6 @@ class Plugins:
     All = "all"   # Wildcard to populate REQUIRES with all available plugins
     Appearance = 'appearance'
     Application = 'application'
-    Breakpoints = 'breakpoints'
     Completions = 'completions'
     Console = 'internal_console'
     Debugger = 'debugger'
@@ -47,7 +46,6 @@ class Plugins:
 
 
 class DockablePlugins:
-    Breakpoints = 'breakpoints'
     Console = 'internal_console'
     Debugger = 'debugger'
     Editor = 'editor'

spyder/api/shellconnect/main_widget.py

@@ -29,17 +29,18 @@ class ShellConnectMainWidget(PluginMainWidget):
     * The current widget in the stack will display the content associated to
       the console with focus.
     """
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, set_layout=True, **kwargs):
         super().__init__(*args, **kwargs)
 
         # Widgets
         self._stack = QStackedWidget(self)
         self._shellwidgets = {}
 
-        # Layout
-        layout = QVBoxLayout()
-        layout.addWidget(self._stack)
-        self.setLayout(layout)
+        if set_layout:
+            # Layout
+            layout = QVBoxLayout()
+            layout.addWidget(self._stack)
+            self.setLayout(layout)
 
     # ---- PluginMainWidget API
     # ------------------------------------------------------------------------

spyder/config/main.py

@@ -190,7 +190,8 @@
               'pdb_execute_events': True,
               'pdb_use_exclamation_mark': True,
               'pdb_stop_first_line': True,
-              'breakpoints_panel': True,
+              'editor_debugger_panel': True,
+              'breakpoints_table_visible': False,
              }),
             ('run',
              {
@@ -329,10 +330,6 @@
               'exclude_case_sensitive': False,
               'max_results': 1000,
               }),
-            ('breakpoints',
-             {
-              'enable': True,
-              }),
             ('completions',
              {
                'enable': True,
@@ -526,6 +523,7 @@
               'debugger/stop': "Ctrl+Shift+F12",
               'debugger/toggle breakpoint': 'F12',
               'debugger/toggle conditional breakpoint': 'Shift+F12',
+              'debugger/show breakpoint table': "",
               # -- Plots --
               'plots/copy': 'Ctrl+C',
               'plots/previous figure': 'Ctrl+PgUp',