From 12885bc9ec1bfe70daa2af73f199f1c36388da50 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Mon, 28 Nov 2022 11:59:48 +0000
Subject: [PATCH] [cm6] Highlight the active visible line (#10441)

* Remove background opacity from selection
* Remove highlightActiveLine and highlightActiveLineGutter extensions
* Add new highlightActiveLine extension
* Adjust zIndex for layers
* Ensure the output file ends with a newline
* Update themes
* Remove the active line highlight when text is selected
* Disable emptyLineFiller temporarily

GitOrigin-RevId: a3228d3441ee2eac136768c3d0788ec471559cd9
---
 package-lock.json         | 40 ---------------------------------------
 services/web/package.json |  2 --
 2 files changed, 42 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1dbc6428c7..25e9758b46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13161,15 +13161,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/color-alpha": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-alpha/-/color-alpha-1.1.3.tgz",
-      "integrity": "sha512-krPYBO1RSO5LH4AGb/b6z70O1Ip2o0F0+0cVFN5FN99jfQtZFT08rQyg+9oOBNJYAn3SRwJIFC8jUEOKz7PisA==",
-      "dev": true,
-      "dependencies": {
-        "color-parse": "^1.4.1"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -13186,15 +13177,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/color-parse": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-1.4.2.tgz",
-      "integrity": "sha512-RI7s49/8yqDj3fECFZjUI1Yi0z/Gq1py43oNJivAIIDSyJiOZLfYCRQEgn8HEVAj++PcRe8AnL2XF0fRJ3BTnA==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0"
-      }
-    },
     "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -38774,8 +38756,6 @@
         "chai-as-promised": "^7.1.1",
         "chai-exclude": "^2.0.3",
         "cheerio": "^1.0.0-rc.3",
-        "color-alpha": "^1.1.3",
-        "color-parse": "^1.4.2",
         "content-disposition": "^0.5.0",
         "copy-webpack-plugin": "^10.2.4",
         "css-loader": "^6.7.1",
@@ -48720,8 +48700,6 @@
         "cheerio": "^1.0.0-rc.3",
         "classnames": "^2.2.6",
         "codemirror": "~5.33.0",
-        "color-alpha": "^1.1.3",
-        "color-parse": "^1.4.2",
         "connect-redis": "^3.1.0",
         "content-disposition": "^0.5.0",
         "contentful": "^6.1.1",
@@ -54611,15 +54589,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color-alpha": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-alpha/-/color-alpha-1.1.3.tgz",
-      "integrity": "sha512-krPYBO1RSO5LH4AGb/b6z70O1Ip2o0F0+0cVFN5FN99jfQtZFT08rQyg+9oOBNJYAn3SRwJIFC8jUEOKz7PisA==",
-      "dev": true,
-      "requires": {
-        "color-parse": "^1.4.1"
-      }
-    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -54633,15 +54602,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "color-parse": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-1.4.2.tgz",
-      "integrity": "sha512-RI7s49/8yqDj3fECFZjUI1Yi0z/Gq1py43oNJivAIIDSyJiOZLfYCRQEgn8HEVAj++PcRe8AnL2XF0fRJ3BTnA==",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0"
-      }
-    },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
diff --git a/services/web/package.json b/services/web/package.json
index da7d022a3b..af51dba4b5 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -272,8 +272,6 @@
     "chai-as-promised": "^7.1.1",
     "chai-exclude": "^2.0.3",
     "cheerio": "^1.0.0-rc.3",
-    "color-alpha": "^1.1.3",
-    "color-parse": "^1.4.2",
     "content-disposition": "^0.5.0",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.7.1",