Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
index 0f5d6f7ae3..1f5e08cd7e 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
@@ -17,6 +17,7 @@ import { getSelectedLocation } from "../../../utils/selected-location";
 import { createHeadlessEditor } from "../../../utils/editor/create-editor";
 
 import { makeBreakpointId } from "../../../utils/breakpoint/index";
+import { features } from "../../../utils/prefs";
 
 import {
   getSelectedSource,
@@ -44,7 +45,7 @@ class Breakpoints extends Component {
     this.removeEditor();
   }
 
-  getEditor() {
+  getHeadlessEditor() {
     if (!this.headlessEditor) {
       this.headlessEditor = createHeadlessEditor();
     }
@@ -119,7 +120,7 @@ class Breakpoints extends Component {
       return null;
     }
 
-    const editor = this.getEditor();
+    const editor = this.getHeadlessEditor();
     const sources = breakpointSources.map(({ source }) => source);
     return div(
       {
@@ -153,7 +154,7 @@ class Breakpoints extends Component {
         className: "pane",
       },
       this.renderExceptionsOptions(),
-      this.renderBreakpoints()
+      !features.codemirrorNext ? this.renderBreakpoints() : null
     );
   }
 }