feat(bookmark): 支持同时在多个光标处创建和删除书签

czfadmin · Nov 27, 2024 · cd02772 · cd02772
1 parent e3b3ddd
commit cd02772
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 53 deletions.
diff --git a/.changeset/khaki-planets-laugh.md b/.changeset/khaki-planets-laugh.md
@@ -0,0 +1,5 @@
+---
+'bookmark-manager': patch
+---
+
+feat(bookmark): 支持同时在多个光标处创建和删除书签
diff --git a/src/utils/bookmark.ts b/src/utils/bookmark.ts
@@ -258,78 +258,83 @@ export async function toggleBookmark(
     return;
   }
 
-  let selection = editor.selection;
+  let selections = editor.selections;
 
   if (context && 'lineNumber' in context) {
     const {lineNumber} = context;
     const line = editor.document.lineAt(lineNumber - 1);
-    selection = getSelectionFromLine(line);
+    selections = [getSelectionFromLine(line)];
   }
 
-  if (!selection) {
+  if (!selections.length) {
     return;
   }
 
-  const {type: bookmarkType, label = '', withColor = false} = extra;
+  for (let selection of selections) {
+    const {type: bookmarkType, label = '', withColor = false} = extra;
 
-  let range, selectionContent;
-  const activeLine = editor.document.lineAt(selection.active.line);
-  if (bookmarkType === BookmarkTypeEnum.LINE) {
-    const startPos = activeLine.text.indexOf(activeLine.text.trim());
-    range = new Selection(
-      activeLine.lineNumber,
-      startPos,
-      activeLine.lineNumber,
-      activeLine.range.end.character,
-    );
+    let range, selectionContent;
+    const activeLine = editor.document.lineAt(selection.active.line);
+    if (bookmarkType === BookmarkTypeEnum.LINE) {
+      const startPos = activeLine.text.indexOf(activeLine.text.trim());
+      range = new Selection(
+        activeLine.lineNumber,
+        startPos,
+        activeLine.lineNumber,
+        activeLine.range.end.character,
+      );
 
-    selectionContent = activeLine.text.trim();
-  } else {
-    range = editor.selection;
-    if (range.isEmpty) {
-      return;
+      selectionContent = activeLine.text.trim();
+    } else {
+      range = editor.selection;
+      if (range.isEmpty) {
+        return;
+      }
+      selectionContent = editor.document.getText(range);
     }
-    selectionContent = editor.document.getText(range);
-  }
 
-  if (
-    bookmarkType === BookmarkTypeEnum.LINE &&
-    checkIfBookmarkIsInGivenSelectionAndRemove(editor, range)
-  ) {
-    return;
-  }
+    if (
+      bookmarkType === BookmarkTypeEnum.LINE &&
+      checkIfBookmarkIsInGivenSelectionAndRemove(editor, range)
+    ) {
+      if (selections.length === 1) {
+        return;
+      }
+      continue;
+    }
 
-  let chosenColor: string | undefined = 'default';
-  if (withColor) {
-    chosenColor = await chooseBookmarkColor();
-    if (!chosenColor) {
-      return;
+    let chosenColor: string | undefined = 'default';
+    if (withColor) {
+      chosenColor = await chooseBookmarkColor();
+      if (!chosenColor) {
+        return;
+      }
     }
-  }
 
-  const fileUri = editor.document.uri;
+    const fileUri = editor.document.uri;
 
-  const bookmark: any = {
-    type: bookmarkType,
-    label,
-    color: chosenColor,
-    description: '',
-    fileUri: editor.document.uri,
-    languageId: editor.document.languageId,
-    selectionContent,
-    fileId: fileUri.fsPath,
-    fileName: editor.document.fileName,
-    rangesOrOptions: {
-      range,
-      hoverMessage: '',
-      renderOptions: {
-        after: {},
+    const bookmark: any = {
+      type: bookmarkType,
+      label,
+      color: chosenColor,
+      description: '',
+      fileUri: editor.document.uri,
+      languageId: editor.document.languageId,
+      selectionContent,
+      fileId: fileUri.fsPath,
+      fileName: editor.document.fileName,
+      rangesOrOptions: {
+        range,
+        hoverMessage: '',
+        renderOptions: {
+          after: {},
+        },
       },
-    },
-    workspaceFolder: workspace.getWorkspaceFolder(editor.document.uri!)!,
-  };
+      workspaceFolder: workspace.getWorkspaceFolder(editor.document.uri!)!,
+    };
 
-  controller.add(bookmark);
+    controller.add(bookmark);
+  }
 }
 /**
  * 删除行标签