Backed out changeset 30d763026100 (bug 1668480) for perma failures on nsLayoutUtils.cpp. CLOSED TREE

devtools/client/shared/sourceeditor/README

@@ -5,7 +5,7 @@ code, and optionally help with indentation.
 
 # Upgrade
 
-Currently used version is 5.58.1. To upgrade: download a new version of
+Currently used version is 5.49.0. To upgrade: download a new version of
 CodeMirror from the project's page [1] and replace all JavaScript and
 CSS files inside the codemirror directory [2].
 

devtools/client/shared/sourceeditor/codemirror/lib/codemirror.css

@@ -164,17 +164,17 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 
 .CodeMirror-scroll {
   overflow: scroll !important; /* Things will break if this is overridden */
-  /* 50px is the magic margin used to hide the element's real scrollbars */
+  /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -50px; margin-right: -50px;
-  padding-bottom: 50px;
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px;
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
 }
 .CodeMirror-sizer {
   position: relative;
-  border-right: 50px solid transparent;
+  border-right: 30px solid transparent;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -184,7 +184,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   position: absolute;
   z-index: 6;
   display: none;
-  outline: none;
 }
 .CodeMirror-vscrollbar {
   right: 0; top: 0;
@@ -213,7 +212,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   height: 100%;
   display: inline-block;
   vertical-align: top;
-  margin-bottom: -50px;
+  margin-bottom: -30px;
 }
 .CodeMirror-gutter-wrapper {
   position: absolute;
@@ -237,6 +236,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 .CodeMirror-lines {
   cursor: text;
   min-height: 1px; /* prevents collapsing before first draw */
+  text-align: left;
 }
 .CodeMirror pre.CodeMirror-line,
 .CodeMirror pre.CodeMirror-line-like {

devtools/client/shared/sourceeditor/codemirror/mozilla.css

@@ -288,12 +288,3 @@
    */
   animation: cursor-blink calc(var(--caret-blink-time, 0.53s) * 2) steps(1) infinite;
 }
-
-
-/*
- * Always align CodeMirror lines to the left.
- * See Bug 1651443 for more information.
- */
-.CodeMirror-lines {
-  text-align: left;
-}

devtools/client/shared/sourceeditor/webpack.config.js

@@ -42,7 +42,9 @@ module.exports = (env, argv) => {
       "./codemirror/lib/codemirror.js",
     ],
     optimization: {
-      minimize: !(argv.optimization && argv.optimization.minimizer === "false"),
+      minimize: !(
+        argv?.optimization && argv.optimization.minimizer === "false"
+      ),
     },
     output: {
       path: path.resolve(__dirname, "./codemirror/"),