From da3b86a15a344597abb0e4b9d711f0a2b7df02d9 Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Mon, 2 Dec 2024 09:19:56 +0530
Subject: [PATCH 1/2] fix: clicking on color gutter didnt bring up editor

---
 src/editor/Editor.js                          | 11 ++++++++++
 .../CSSColorPreview/main.js                   | 20 +++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/editor/Editor.js b/src/editor/Editor.js
index 64594a8317..399ee04403 100644
--- a/src/editor/Editor.js
+++ b/src/editor/Editor.js
@@ -1130,6 +1130,17 @@ define(function (require, exports, module) {
         return cm.getRange(pos, { line: pos.line, ch: pos.ch + 1 });
     };
 
+    /**
+     * Retrieves a single line text
+     * @param {number} lineNumber - The lineNumber to extract text from
+     * @returns {string|null} The text at the given position if within bounds,
+     *                        otherwise `null` if the position is out of range.
+     */
+    Editor.prototype.getLine = function (lineNumber) {
+        const retrievedText = this._codeMirror.getLine(lineNumber);
+        return retrievedText === undefined ? null : retrievedText;
+    };
+
     /**
      * Retrieves a single character previous to the specified position in the editor in the same line if possible.
      * x|y where `|` is the cursor, will return x
diff --git a/src/extensionsIntegrated/CSSColorPreview/main.js b/src/extensionsIntegrated/CSSColorPreview/main.js
index 2233159b70..8345df40d8 100644
--- a/src/extensionsIntegrated/CSSColorPreview/main.js
+++ b/src/extensionsIntegrated/CSSColorPreview/main.js
@@ -62,13 +62,12 @@ define(function (require, exports, module) {
      */
     function _getAllColorsAndLineNums(editor) {
 
-        const cm = editor._codeMirror;
-        const nLen = cm.lineCount();
+        const nLen = editor.lineCount();
         const aColors = [];
 
         // match colors and push into an array
         for (let i = 0; i < nLen; i++) {
-            let lineText = cm.getLine(i);
+            let lineText = editor.getLine(i);
 
             if ((lineText.indexOf('/*') !== -1) || (lineText.indexOf('*/') !== -1)) {
                 continue;
@@ -147,25 +146,24 @@ define(function (require, exports, module) {
 
     /**
      * To move the cursor to the color text and display the color quick edit
-     * @param {Editor} codem the codemirror instance
+     * @param {CodeMirror} codeMirror the codemirror instance
      * @param {Number} lineNumber the line number that is clicked
      * @param {String} gutter the gutter name
      */
-    function colorIconClicked(codem, lineNumber, gutter) {
+    function colorIconClicked(codeMirror, lineNumber, gutter) {
         const editor = EditorManager.getActiveEditor();
-        const cm = editor._codeMirror;
 
-        if(gutter === 'CodeMirror-linenumbers') {
+        if(gutter === GUTTER_NAME) {
 
             let colorValue;
 
-            for(let i of codem.colorGutters) {
+            for(let i of codeMirror.colorGutters) {
                 if(i.lineNumber === lineNumber) {
                     colorValue = i.colorValues[0];
                 }
             }
 
-            const lineText = cm.getLine(lineNumber);
+            const lineText = editor.getLine(lineNumber);
             const colorIndex = lineText.indexOf(colorValue);
 
             if (colorIndex !== -1) {
@@ -196,8 +194,8 @@ define(function (require, exports, module) {
             editor.clearGutter(GUTTER_NAME); // clear color markers
             _addDummyGutterMarkerIfNotExist(editor, editor.getCursorPos().line);
 
-            cm.on("gutterClick", (codem, lineNumber, gutter) => {
-                colorIconClicked(codem, lineNumber, gutter);
+            cm.on("gutterClick", (codeMirror, lineNumber, gutter) => {
+                colorIconClicked(codeMirror, lineNumber, gutter);
             });
 
             // Only add markers if enabled

From e8ea4cd02ec6217b8ba1f2a4fdc3f89817168924 Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Mon, 2 Dec 2024 09:24:03 +0530
Subject: [PATCH 2/2] test: add uts for editor.getLine API

---
 test/spec/Editor-test.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/spec/Editor-test.js b/test/spec/Editor-test.js
index 1a727b94d3..58186635de 100644
--- a/test/spec/Editor-test.js
+++ b/test/spec/Editor-test.js
@@ -449,7 +449,13 @@ define(function (require, exports, module) {
                 });
             });
 
-            describe("getCursorPos", function () {
+            describe("getCursorPos and getLine", function () {
+                it("should getLine work correctly", function () {
+                    expect(myEditor.getLine(0)).toEqual("this is line 0");
+                    expect(myEditor.getLine(10000)).toEqual(null);
+                    expect(myEditor.getLine(-1)).toEqual(null);
+                });
+
                 it("should return a single cursor", function () {
                     myEditor._codeMirror.setCursor(0, 2);
                     expect(myEditor.getCursorPos().line).toEqual(0);