Bug 1528855 - [release 126] Fix Bugzilla 1108132 - Provide code wrapp…

…ing pref for debugger (#7959). r=dwalsh
Brli · Feb 19, 2019 · 867f0b8 · 867f0b8
1 parent 6bf357a
commit 867f0b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/devtools/client/debugger/new/src/utils/editor/create-editor.js b/devtools/client/debugger/new/src/utils/editor/create-editor.js
@@ -5,7 +5,7 @@
 // @flow
 
 import SourceEditor from "./source-editor";
-import { features } from "../prefs";
+import { features, prefs } from "../prefs";
 
 export function createEditor() {
   const gutters = ["breakpoints", "hit-markers", "CodeMirror-linenumbers"];
@@ -22,7 +22,7 @@ export function createEditor() {
     lineNumbers: true,
     theme: "mozilla",
     styleActiveLine: false,
-    lineWrapping: false,
+    lineWrapping: prefs.editorWrapping,
     matchBrackets: true,
     showAnnotationRuler: true,
     gutters,

diff --git a/devtools/client/debugger/new/src/utils/prefs.js b/devtools/client/debugger/new/src/utils/prefs.js
@@ -35,6 +35,7 @@ if (isDevelopment()) {
   pref("devtools.debugger.end-panel-size", 300);
   pref("devtools.debugger.tabs", "[]");
   pref("devtools.debugger.tabsBlackBoxed", "[]");
+  pref("devtools.debugger.ui.editor-wrapping", false);
   pref("devtools.debugger.ui.framework-grouping-on", true);
   pref("devtools.debugger.pending-selected-location", "{}");
   pref("devtools.debugger.pending-breakpoints", "{}");
@@ -69,6 +70,7 @@ if (isDevelopment()) {
 
 export const prefs = new PrefsHelper("devtools", {
   logging: ["Bool", "debugger.logging"],
+  editorWrapping: ["Bool", "debugger.ui.editor-wrapping"],
   alphabetizeOutline: ["Bool", "debugger.alphabetize-outline"],
   autoPrettyPrint: ["Bool", "debugger.auto-pretty-print"],
   clientSourceMapsEnabled: ["Bool", "source-map.client-service.enabled"],

diff --git a/devtools/client/preferences/debugger.js b/devtools/client/preferences/debugger.js
@@ -26,6 +26,7 @@ pref("devtools.debugger.ui.variables-sorting-enabled", true);
 pref("devtools.debugger.ui.variables-only-enum-visible", false);
 pref("devtools.debugger.ui.variables-searchbox-visible", false);
 pref("devtools.debugger.ui.framework-grouping-on", true);
+pref("devtools.debugger.ui.editor-wrapping", false);
 pref("devtools.debugger.call-stack-visible", true);
 pref("devtools.debugger.scopes-visible", true);
 pref("devtools.debugger.component-visible", true);