Merging upstream version 125.0.1.

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

1 files changed, 12 insertions, 2 deletions

diff --git a/devtools/client/debugger/src/utils/editor/index.js b/devtools/client/debugger/src/utils/editor/index.js
index 1adc73b4f8..d12e2f29f1 100644
--- a/devtools/client/debugger/src/utils/editor/index.js
+++ b/devtools/client/debugger/src/utils/editor/index.js
@@ -14,12 +14,12 @@ import { createLocation } from "../location";
 
 let editor;
 
-export function getEditor() {
+export function getEditor(useCm6) {
   if (editor) {
     return editor;
   }
 
-  editor = createEditor();
+  editor = createEditor(useCm6);
   return editor;
 }
 
@@ -27,6 +27,16 @@ export function removeEditor() {
   editor = null;
 }
 
+/**
+ *  Update line wrapping for the codemirror editor.
+ */
+export function updateEditorLineWrapping(value) {
+  if (!editor) {
+    return;
+  }
+  editor.setLineWrapping(value);
+}
+
 function getCodeMirror() {
   return editor && editor.hasCodeMirror ? editor.codeMirror : null;
 }