fix: handle cases when multiple cursors are present

Author: devvaannsh

src/extensionsIntegrated/Bookmarks/src/bookmarks.js

@@ -1,39 +1,45 @@
 define(function (require, exports, module) {
-    const EditorManager = require("editor/EditorManager"),
-        Editor = require("editor/Editor").Editor;
+    const EditorManager = require("editor/EditorManager");
+    const Editor = require("editor/Editor").Editor;
+
+    const Helper = require("./helper");
 
     const GUTTER_NAME = "CodeMirror-bookmarkGutter",
         BOOKMARK_PRIORITY = 100;
 
-    // the bookmark svg icon
-    const bookmarkSvg = require("text!styles/images/bookmark.svg");
-
     // initialize the bookmark gutter
     Editor.registerGutter(GUTTER_NAME, BOOKMARK_PRIORITY);
 
     /**
-     * This function is responsible to toggle a bookmark at the current cursor position
+     * This function toggles a bookmark on a specific line
+     *
+     * @param {Editor} editor - The current editor instance
+     * @param {number} line - The line number to toggle bookmark on
+     */
+    function toggleLineBookmark(editor, line) {
+        if (Helper.hasBookmark(editor, line, GUTTER_NAME)) {
+            editor.setGutterMarker(line, GUTTER_NAME, "");
+        } else {
+            editor.setGutterMarker(line, GUTTER_NAME, Helper.createBookmarkMarker());
+        }
+    }
+
+    /**
+     * This function is responsible to toggle bookmarks at the current cursor position(s)
      */
     function toggleBookmark() {
         const editor = EditorManager.getFocusedEditor();
         if (!editor) {
             return;
         }
 
-        const selection = editor.getSelection();
-        const currentLine = selection.start.line;
-
-        // check whether there's already a bookmark on this line
-        const marker = editor.getGutterMarker(currentLine, GUTTER_NAME);
+        const selections = editor.getSelections();
+        const uniqueLines = Helper.getUniqueLines(selections);
 
-        if (marker) {
-            // remove bookmark if exists
-            editor.setGutterMarker(currentLine, GUTTER_NAME, "");
-        } else {
-            // add the bookmark
-            const $marker = $("<div>").addClass("bookmark-icon").html(bookmarkSvg);
-            editor.setGutterMarker(currentLine, GUTTER_NAME, $marker[0]);
-        }
+        // process each unique line
+        uniqueLines.forEach((line) => {
+            toggleLineBookmark(editor, line);
+        });
     }
 
     exports.toggleBookmark = toggleBookmark;

src/extensionsIntegrated/Bookmarks/src/helper.js

@@ -0,0 +1,40 @@
+define(function (require, exports, module) {
+    // the bookmark svg icon
+    const bookmarkSvg = require("text!styles/images/bookmark.svg");
+
+    /**
+     * This function creates a bookmark marker element
+     *
+     * @returns {HTMLElement} The bookmark marker element
+     */
+    function createBookmarkMarker() {
+        return $("<div>").addClass("bookmark-icon").html(bookmarkSvg)[0];
+    }
+
+    /**
+     * This function checks whether a line has a bookmark
+     *
+     * @param {Editor} editor - The current editor instance
+     * @param {number} line - The line number to check
+     * @param {string} gutterName - The name of the gutter
+     * @returns {boolean} True if the line has a bookmark, false otherwise
+     */
+    function hasBookmark(editor, line, gutterName) {
+        return !!editor.getGutterMarker(line, gutterName);
+    }
+
+    /**
+     * This function gets unique line numbers from all selections
+     * this is needed so that when multiple cursors are there at the same line, we can get the line only once
+     *
+     * @param {Array<{start: {line: number}}>} selections - Array of selections
+     * @returns {Array<number>} Array of unique line numbers
+     */
+    function getUniqueLines(selections) {
+        return [...new Set(selections.map((selection) => selection.start.line))];
+    }
+
+    exports.createBookmarkMarker = createBookmarkMarker;
+    exports.hasBookmark = hasBookmark;
+    exports.getUniqueLines = getUniqueLines;
+});