Rewrite some bookmark actions according to https://www.figma.com/file/vLwl7TPb01eB6ks...
authorSergey Malenkov <sergey.malenkov@jetbrains.com>
Thu, 21 Jan 2021 22:52:26 +0000 (01:52 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Thu, 21 Jan 2021 22:53:28 +0000 (22:53 +0000)
GitOrigin-RevId: afb2d5d6474d68675997813dc50e5998958250df

platform/lang-api/resources/messages/BookmarkBundle.properties
platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkAction.kt
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java [deleted file]
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkTypeAction.kt [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java [deleted file]
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.kt [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkTypeAction.kt [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java [deleted file]
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources/src/idea/LangActions.xml

index 232d4dc50c4f162015ed6d764a0638f9fc804f10..a5c4de9926a010f5035e5a1dbf44431a238c0a5f 100644 (file)
@@ -8,15 +8,19 @@ action.bookmark.edit.description=Edit Description
 action.bookmark.move.down=Move Bookmark Down
 action.bookmark.move.up=Move Bookmark Up
 action.bookmark.toggle.sort=Sort Bookmarks by Mnemonic, File, and Line
-action.bookmark.toggle=Toggle _Bookmark
-action.clear.bookmark.text=Clear Bookmark
 action.delete.current.bookmark.description=Delete current bookmark
-action.set.bookmark.text=Set Bookmark
 bookmark.file.X.line.Y={0}, line {1}
 bookmark.shortcut.to.jump={0} to jump to
 bookmark.shortcut.to.toggle.and.jump={0} to toggle, {1} to jump to
 bookmark.shortcut.to.toggle={0} to toggle
 bookmark.text=Bookmark
+bookmark.add.action.text=Add _Bookmark
+bookmark.delete.action.text=Delete _Bookmark
+bookmark.edit.action.text=Edit Bookmark Description...
+bookmark.edit.action.description=Edit description of this bookmark
+bookmark.toggle.action.text=Toggle _Bookmark
+bookmark.type.toggle.action.text=Toggle Bookmark {0}
+goto.bookmark.type.action.text=Go to Bookmark {0}
 mnemonic.chooser.bookmark.create.action.text=Add Mnemonic Bookmark...
 mnemonic.chooser.bookmark.create.popup.title=Add Mnemonic Bookmark
 mnemonic.chooser.mnemonic.assign.action.text=Assign Mnemonic...
index b209af719de74570bdb0a9d79c653b1e34430a1d..cc6cb575f59ae3be804c1796668bf80d9d43356c 100644 (file)
@@ -42,7 +42,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.InputEvent;
 import java.util.List;
@@ -140,7 +139,7 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
     }
   }
 
-  public void editDescription(@NotNull Bookmark bookmark, @NotNull JComponent popup) {
+  public void editDescription(@NotNull Bookmark bookmark, @NotNull Component popup) {
     ApplicationManager.getApplication().assertIsDispatchThread();
     String description = Messages.showInputDialog(popup, BookmarkBundle.message("action.bookmark.edit.description.dialog.message"),
                        BookmarkBundle.message("action.bookmark.edit.description.dialog.title"), Messages.getQuestionIcon(),
@@ -444,6 +443,7 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
 
     bookmark.setMnemonic(c);
     getPublisher().bookmarkChanged(bookmark);
+    bookmark.updateHighlighter();
   }
 
   public void setDescription(@NotNull Bookmark bookmark, @NotNull @NlsSafe String description) {
index b0cbbee3af0a694f2d72d1e8102e8965b2597554..95bb05963b5ff8a7d7f2d0920b782cd8ffca4481 100644 (file)
@@ -1,23 +1,31 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.ide.bookmarks.actions
 
-import com.intellij.ide.bookmarks.BookmarkManager
-import com.intellij.ide.bookmarks.actions.ToggleBookmarkAction.getBookmarkInfo
+import com.intellij.icons.AllIcons.Actions.Edit
+import com.intellij.ide.bookmarks.BookmarkBundle.messagePointer
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.project.DumbAwareAction
-import javax.swing.JComponent
 
-class EditBookmarkAction : DumbAwareAction() {
-  override fun actionPerformed(e: AnActionEvent) {
-    val project = e.project ?: return
-    val bookmark = getBookmarkInfo(e)?.bookmarkAtPlace ?: return
-    val contextComponent = e.getData(PlatformDataKeys.CONTEXT_COMPONENT) as? JComponent ?: return
-    BookmarkManager.getInstance(project).editDescription(bookmark, contextComponent)
+internal class EditBookmarkAction : DumbAwareAction(
+  messagePointer("bookmark.edit.action.text"),
+  messagePointer("bookmark.edit.action.description"),
+  Edit) {
+
+  override fun update(event: AnActionEvent) {
+    val component = event.getData(PlatformDataKeys.CONTEXT_COMPONENT)
+    val bookmark = component?.let { event.dataContext.context?.bookmark }
+    event.presentation.isEnabledAndVisible = bookmark != null
+  }
+
+  override fun actionPerformed(event: AnActionEvent) {
+    val component = event.getData(PlatformDataKeys.CONTEXT_COMPONENT) ?: return
+    val context = event.dataContext.context ?: return
+    val bookmark = context.bookmark ?: return
+    context.manager.editDescription(bookmark, component)
   }
 
-  override fun update(e: AnActionEvent) {
-    val info = getBookmarkInfo(e)
-    e.presentation.isEnabledAndVisible = info != null && info.bookmarkAtPlace != null
+  init {
+    isEnabledInModalContext = true
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java
deleted file mode 100644 (file)
index b5537d1..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.ide.bookmarks.actions;
-
-import com.intellij.ide.bookmarks.Bookmark;
-import com.intellij.ide.bookmarks.BookmarkManager;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-public abstract class GoToMnemonicBookmarkActionBase extends AnAction implements DumbAware {
-  private final int myNumber;
-
-  public GoToMnemonicBookmarkActionBase(int n) {
-    myNumber = n;
-  }
-
-  @Override
-  public void update(@NotNull AnActionEvent e) {
-    e.getPresentation().setEnabled(getBookmark(e) != null);
-  }
-
-  @Override
-  public void actionPerformed(@NotNull AnActionEvent e) {
-    Bookmark bookmark = getBookmark(e);
-    if (bookmark != null) {
-      bookmark.navigate(true);
-    }
-  }
-
-  private Bookmark getBookmark(@NotNull AnActionEvent e) {
-    Project project = e.getProject();
-    if (project != null) {
-      Bookmark bookmark = BookmarkManager.getInstance(project).findBookmarkForMnemonic((char)('0' + myNumber));
-      if (bookmark != null && bookmark.canNavigate()) {
-        return bookmark;
-      }
-    }
-    return null;
-  }
-
-  public static class GotoBookmark0Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark0Action() {
-      super(0);
-    }
-  }
-
-  public static class GotoBookmark1Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark1Action() {
-      super(1);
-    }
-  }
-
-  public static class GotoBookmark2Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark2Action() {
-      super(2);
-    }
-  }
-
-  public static class GotoBookmark3Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark3Action() {
-      super(3);
-    }
-  }
-
-  public static class GotoBookmark4Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark4Action() {
-      super(4);
-    }
-  }
-
-  public static class GotoBookmark5Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark5Action() {
-      super(5);
-    }
-  }
-
-  public static class GotoBookmark6Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark6Action() {
-      super(6);
-    }
-  }
-
-  public static class GotoBookmark7Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark7Action() {
-      super(7);
-    }
-  }
-
-  public static class GotoBookmark8Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark8Action() {
-      super(8);
-    }
-  }
-
-  public static class GotoBookmark9Action extends GoToMnemonicBookmarkActionBase {
-    public GotoBookmark9Action() {
-      super(9);
-    }
-  }
-}
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkTypeAction.kt b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GotoBookmarkTypeAction.kt
new file mode 100644 (file)
index 0000000..2d6fe1c
--- /dev/null
@@ -0,0 +1,68 @@
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.ide.bookmarks.actions
+
+import com.intellij.ide.bookmarks.BookmarkBundle.messagePointer
+import com.intellij.ide.bookmarks.BookmarkManager
+import com.intellij.ide.bookmarks.BookmarkType
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.DumbAwareAction
+
+internal open class GotoBookmarkTypeAction(
+  private val type: BookmarkType
+) : DumbAwareAction(messagePointer("goto.bookmark.type.action.text", type.mnemonic)) {
+
+  override fun update(event: AnActionEvent) {
+    event.presentation.isEnabledAndVisible = getNavigatableBookmark(event) != null
+  }
+
+  override fun actionPerformed(event: AnActionEvent) {
+    getNavigatableBookmark(event)?.navigate(true)
+  }
+
+  private fun getNavigatableBookmark(event: AnActionEvent) = event.project
+    ?.let { BookmarkManager.getInstance(it) }
+    ?.findBookmarkForMnemonic(type.mnemonic)
+    ?.let { if (it.canNavigate()) it else null }
+
+  init {
+    isEnabledInModalContext = true
+  }
+}
+
+internal class GotoBookmark1Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_1)
+internal class GotoBookmark2Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_2)
+internal class GotoBookmark3Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_3)
+internal class GotoBookmark4Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_4)
+internal class GotoBookmark5Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_5)
+internal class GotoBookmark6Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_6)
+internal class GotoBookmark7Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_7)
+internal class GotoBookmark8Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_8)
+internal class GotoBookmark9Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_9)
+internal class GotoBookmark0Action : GotoBookmarkTypeAction(BookmarkType.DIGIT_0)
+
+internal class GotoBookmarkAAction : GotoBookmarkTypeAction(BookmarkType.LETTER_A)
+internal class GotoBookmarkBAction : GotoBookmarkTypeAction(BookmarkType.LETTER_B)
+internal class GotoBookmarkCAction : GotoBookmarkTypeAction(BookmarkType.LETTER_C)
+internal class GotoBookmarkDAction : GotoBookmarkTypeAction(BookmarkType.LETTER_D)
+internal class GotoBookmarkEAction : GotoBookmarkTypeAction(BookmarkType.LETTER_E)
+internal class GotoBookmarkFAction : GotoBookmarkTypeAction(BookmarkType.LETTER_F)
+internal class GotoBookmarkGAction : GotoBookmarkTypeAction(BookmarkType.LETTER_G)
+internal class GotoBookmarkHAction : GotoBookmarkTypeAction(BookmarkType.LETTER_H)
+internal class GotoBookmarkIAction : GotoBookmarkTypeAction(BookmarkType.LETTER_I)
+internal class GotoBookmarkJAction : GotoBookmarkTypeAction(BookmarkType.LETTER_J)
+internal class GotoBookmarkKAction : GotoBookmarkTypeAction(BookmarkType.LETTER_K)
+internal class GotoBookmarkLAction : GotoBookmarkTypeAction(BookmarkType.LETTER_L)
+internal class GotoBookmarkMAction : GotoBookmarkTypeAction(BookmarkType.LETTER_M)
+internal class GotoBookmarkNAction : GotoBookmarkTypeAction(BookmarkType.LETTER_N)
+internal class GotoBookmarkOAction : GotoBookmarkTypeAction(BookmarkType.LETTER_O)
+internal class GotoBookmarkPAction : GotoBookmarkTypeAction(BookmarkType.LETTER_P)
+internal class GotoBookmarkQAction : GotoBookmarkTypeAction(BookmarkType.LETTER_Q)
+internal class GotoBookmarkRAction : GotoBookmarkTypeAction(BookmarkType.LETTER_R)
+internal class GotoBookmarkSAction : GotoBookmarkTypeAction(BookmarkType.LETTER_S)
+internal class GotoBookmarkTAction : GotoBookmarkTypeAction(BookmarkType.LETTER_T)
+internal class GotoBookmarkUAction : GotoBookmarkTypeAction(BookmarkType.LETTER_U)
+internal class GotoBookmarkVAction : GotoBookmarkTypeAction(BookmarkType.LETTER_V)
+internal class GotoBookmarkWAction : GotoBookmarkTypeAction(BookmarkType.LETTER_W)
+internal class GotoBookmarkXAction : GotoBookmarkTypeAction(BookmarkType.LETTER_X)
+internal class GotoBookmarkYAction : GotoBookmarkTypeAction(BookmarkType.LETTER_Y)
+internal class GotoBookmarkZAction : GotoBookmarkTypeAction(BookmarkType.LETTER_Z)
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java
deleted file mode 100644 (file)
index af63697..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.ide.bookmarks.actions;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.bookmarks.BookmarkBundle;
-import com.intellij.ide.bookmarks.BookmarkManager;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-public class ToggleBookmarkAction extends BookmarksAction implements DumbAware, Toggleable {
-  public ToggleBookmarkAction() {
-    getTemplatePresentation().setText(BookmarkBundle.messagePointer("action.bookmark.toggle"));
-  }
-
-  @Override
-  public void update(@NotNull AnActionEvent event) {
-    Project project = event.getProject();
-    DataContext dataContext = event.getDataContext();
-    event.getPresentation().setEnabled(project != null &&
-                                       (CommonDataKeys.EDITOR.getData(dataContext) != null ||
-                                        CommonDataKeys.VIRTUAL_FILE.getData(dataContext) != null));
-
-    if (ActionPlaces.TOUCHBAR_GENERAL.equals(event.getPlace())) {
-      event.getPresentation().setIcon(AllIcons.Actions.Checked);
-    }
-
-    final BookmarkInContextInfo info = getBookmarkInfo(event);
-    final boolean selected = info != null && info.getBookmarkAtPlace() != null;
-    if (ActionPlaces.isPopupPlace(event.getPlace())) {
-      event.getPresentation().setText(selected ? BookmarkBundle.message("action.clear.bookmark.text") :
-                                      BookmarkBundle.message("action.set.bookmark.text"));
-    }
-    else {
-      event.getPresentation().setText(BookmarkBundle.messagePointer("action.bookmark.toggle"));
-      Toggleable.setSelected(event.getPresentation(), selected);
-    }
-  }
-
-  @Override
-  public void actionPerformed(@NotNull AnActionEvent e) {
-    Project project = e.getProject();
-    if (project == null) return;
-
-    final BookmarkInContextInfo info = getBookmarkInfo(e);
-    if (info == null) return;
-
-    final boolean selected = info.getBookmarkAtPlace() != null;
-    Toggleable.setSelected(e.getPresentation(), selected);
-
-    if (selected) {
-      BookmarkManager.getInstance(project).removeBookmark(info.getBookmarkAtPlace());
-    }
-    else {
-      Editor editor = e.getData(CommonDataKeys.EDITOR);
-      if (editor != null) {
-        BookmarkManager.getInstance(project).addEditorBookmark(editor, info.getLine());
-      }
-      else {
-        BookmarkManager.getInstance(project).addTextBookmark(info.getFile(), info.getLine(), "");
-      }
-    }
-  }
-
-  public static BookmarkInContextInfo getBookmarkInfo(@NotNull AnActionEvent e) {
-    Project project = e.getProject();
-    if (project == null) return null;
-
-    final BookmarkInContextInfo info = new BookmarkInContextInfo(e.getDataContext(), project).invoke();
-    return info.getFile() == null ? null : info;
-  }
-}
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.kt b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.kt
new file mode 100644 (file)
index 0000000..3383abd
--- /dev/null
@@ -0,0 +1,37 @@
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.ide.bookmarks.actions
+
+import com.intellij.icons.AllIcons.Actions.Checked
+import com.intellij.ide.bookmarks.BookmarkBundle.messagePointer
+import com.intellij.ide.bookmarks.BookmarkType
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.Toggleable
+import com.intellij.openapi.project.DumbAwareAction
+
+internal class ToggleBookmarkAction : Toggleable, DumbAwareAction(messagePointer("bookmark.toggle.action.text")) {
+
+  override fun update(event: AnActionEvent) {
+    val context = event.dataContext.context
+    val selected = context?.bookmark != null
+    event.presentation.apply {
+      isEnabledAndVisible = context != null
+      println("before: $text   $icon")
+      if (ActionPlaces.TOUCHBAR_GENERAL == event.place) {
+        Toggleable.setSelected(this, selected)
+        icon = Checked
+      }
+      setText(when {
+                !ActionPlaces.isPopupPlace(event.place) -> messagePointer("bookmark.toggle.action.text")
+                selected -> messagePointer("bookmark.delete.action.text")
+                else -> messagePointer("bookmark.add.action.text")
+              })
+      println(" after: $text   $icon")
+    }
+  }
+
+  override fun actionPerformed(event: AnActionEvent) {
+    val context = event.dataContext.context ?: return
+    context.setType(context.bookmark?.type ?: BookmarkType.DEFAULT)
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkTypeAction.kt b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkTypeAction.kt
new file mode 100644 (file)
index 0000000..2147e8d
--- /dev/null
@@ -0,0 +1,62 @@
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.ide.bookmarks.actions
+
+import com.intellij.ide.bookmarks.BookmarkBundle.messagePointer
+import com.intellij.ide.bookmarks.BookmarkType
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.DumbAwareAction
+
+internal open class ToggleBookmarkTypeAction(
+  private val type: BookmarkType
+) : DumbAwareAction(messagePointer("bookmark.type.toggle.action.text", type.mnemonic)) {
+
+  override fun update(event: AnActionEvent) {
+    event.presentation.isEnabledAndVisible = event.dataContext.context != null
+  }
+
+  override fun actionPerformed(event: AnActionEvent) {
+    event.dataContext.context?.setType(type)
+  }
+
+  init {
+    isEnabledInModalContext = true
+  }
+}
+
+internal class ToggleBookmark1Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_1)
+internal class ToggleBookmark2Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_2)
+internal class ToggleBookmark3Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_3)
+internal class ToggleBookmark4Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_4)
+internal class ToggleBookmark5Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_5)
+internal class ToggleBookmark6Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_6)
+internal class ToggleBookmark7Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_7)
+internal class ToggleBookmark8Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_8)
+internal class ToggleBookmark9Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_9)
+internal class ToggleBookmark0Action : ToggleBookmarkTypeAction(BookmarkType.DIGIT_0)
+
+internal class ToggleBookmarkAAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_A)
+internal class ToggleBookmarkBAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_B)
+internal class ToggleBookmarkCAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_C)
+internal class ToggleBookmarkDAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_D)
+internal class ToggleBookmarkEAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_E)
+internal class ToggleBookmarkFAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_F)
+internal class ToggleBookmarkGAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_G)
+internal class ToggleBookmarkHAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_H)
+internal class ToggleBookmarkIAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_I)
+internal class ToggleBookmarkJAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_J)
+internal class ToggleBookmarkKAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_K)
+internal class ToggleBookmarkLAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_L)
+internal class ToggleBookmarkMAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_M)
+internal class ToggleBookmarkNAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_N)
+internal class ToggleBookmarkOAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_O)
+internal class ToggleBookmarkPAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_P)
+internal class ToggleBookmarkQAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_Q)
+internal class ToggleBookmarkRAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_R)
+internal class ToggleBookmarkSAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_S)
+internal class ToggleBookmarkTAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_T)
+internal class ToggleBookmarkUAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_U)
+internal class ToggleBookmarkVAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_V)
+internal class ToggleBookmarkWAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_W)
+internal class ToggleBookmarkXAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_X)
+internal class ToggleBookmarkYAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_Y)
+internal class ToggleBookmarkZAction : ToggleBookmarkTypeAction(BookmarkType.LETTER_Z)
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleNumberedBookmarkActionBase.java
deleted file mode 100644 (file)
index 00fc278..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.ide.bookmarks.actions;
-
-import com.intellij.ide.bookmarks.Bookmark;
-import com.intellij.ide.bookmarks.BookmarkManager;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-public abstract class ToggleNumberedBookmarkActionBase extends AnAction implements DumbAware {
-  private final int myNumber;
-
-  public ToggleNumberedBookmarkActionBase(int n) {
-    setEnabledInModalContext(true);
-    myNumber = n;
-  }
-
-  @Override
-  public void update(@NotNull AnActionEvent e) {
-    e.getPresentation().setEnabled(e.getProject() != null);
-  }
-
-  @Override
-  public void actionPerformed(@NotNull AnActionEvent e) {
-    Project project = e.getProject();
-    if (project == null) return;
-
-    BookmarksAction.BookmarkInContextInfo info = new BookmarksAction.BookmarkInContextInfo(e.getDataContext(), project).invoke();
-    if (info.getFile() == null) return;
-
-    Bookmark oldBookmark = info.getBookmarkAtPlace();
-    BookmarkManager manager = BookmarkManager.getInstance(project);
-
-    if (oldBookmark != null) {
-      manager.removeBookmark(oldBookmark);
-    }
-
-    char mnemonic = (char)('0' + myNumber);
-    if (oldBookmark == null || oldBookmark.getMnemonic() != mnemonic) {
-      Bookmark bookmark = manager.addTextBookmark(info.getFile(), info.getLine(), "");
-      manager.setMnemonic(bookmark, mnemonic);
-    }
-  }
-
-  public static class ToggleBookmark0Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark0Action() {
-      super(0);
-    }
-  }
-
-  public static class ToggleBookmark1Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark1Action() {
-      super(1);
-    }
-  }
-
-  public static class ToggleBookmark2Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark2Action() {
-      super(2);
-    }
-  }
-
-  public static class ToggleBookmark3Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark3Action() {
-      super(3);
-    }
-  }
-
-  public static class ToggleBookmark4Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark4Action() {
-      super(4);
-    }
-  }
-
-  public static class ToggleBookmark5Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark5Action() {
-      super(5);
-    }
-  }
-
-  public static class ToggleBookmark6Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark6Action() {
-      super(6);
-    }
-  }
-
-  public static class ToggleBookmark7Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark7Action() {
-      super(7);
-    }
-  }
-
-  public static class ToggleBookmark8Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark8Action() {
-      super(8);
-    }
-  }
-
-  public static class ToggleBookmark9Action extends ToggleNumberedBookmarkActionBase {
-    public ToggleBookmark9Action() {
-      super(9);
-    }
-  }
-}
index c086fd8960c434296e9434edf72902fabb887220..222696d3fdfe44051da187d814a13c49d59d97a2 100644 (file)
@@ -400,8 +400,6 @@ action.NewElementSamePlace.text=_New in This Directory...
 action.NewElementSamePlace.description=Create new class, interface, file or directory in this directory
 action.$Delete.text=_Delete
 action.$Delete.description=Delete selected item
-action.ToggleBookmark.text=Toggle _Bookmark
-action.ToggleBookmark.description=Toggle bookmark at the current location
 action.ShowBookmarks.text=_Show Bookmarks
 action.ShowBookmarks.description=Show list of all bookmarks
 action.Find.text=_Find...
@@ -1166,26 +1164,8 @@ group.OtherMenu.text=Other
 group.OtherMenu.description=Actions that are not properly registered
 group.MainToolBar.text=Main Toolbar
 group.Bookmarks.text=Bookmarks
-action.ToggleBookmark0.text=Toggle Bookmark 0
-action.ToggleBookmark1.text=Toggle Bookmark 1
-action.ToggleBookmark2.text=Toggle Bookmark 2
-action.ToggleBookmark3.text=Toggle Bookmark 3
-action.ToggleBookmark4.text=Toggle Bookmark 4
-action.ToggleBookmark5.text=Toggle Bookmark 5
-action.ToggleBookmark6.text=Toggle Bookmark 6
-action.ToggleBookmark7.text=Toggle Bookmark 7
-action.ToggleBookmark8.text=Toggle Bookmark 8
-action.ToggleBookmark9.text=Toggle Bookmark 9
-action.GotoBookmark0.text=Go to Bookmark 0
-action.GotoBookmark1.text=Go to Bookmark 1
-action.GotoBookmark2.text=Go to Bookmark 2
-action.GotoBookmark3.text=Go to Bookmark 3
-action.GotoBookmark4.text=Go to Bookmark 4
-action.GotoBookmark5.text=Go to Bookmark 5
-action.GotoBookmark6.text=Go to Bookmark 6
-action.GotoBookmark7.text=Go to Bookmark 7
-action.GotoBookmark8.text=Go to Bookmark 8
-action.GotoBookmark9.text=Go to Bookmark 9
+group.Bookmarks.Goto.text=Go to Type
+group.Bookmarks.Toggle.text=Toggle Type
 
 action.XDebugger.SetValue.text=Set Value...
 action.XDebugger.SetValue.XDebuggerTreeInlayPopup.text=Set Value
@@ -1762,9 +1742,6 @@ action.EditorShowGutterIconTooltip.text=Show Gutter Icon Tooltip (accessibility)
 action.ConfigureEditorTabs.text=Configure Editor Tabs...
 action.ConfigureEditorTabs.description=Configure the look, behavior and order of editor tabs
 
-action.EditBookmark.text=Edit Bookmark Description...
-action.EditBookmark.description=Edit description of this bookmark
-
 action.SetupMiniconda.actionName=Install Miniconda 3
 action.SetupMiniconda.actionNameWithDots=Install Miniconda 3...
 action.SetupMiniconda.specifyPath=Installation path for Miniconda 3:
index da2c791f08ecd23415174e0a18c84b2e75000118..92c44cc62e4a1fe66c5e88c0f448ae260d1b0acd 100644 (file)
       <add-to-group group-id="EditSelectGroup" anchor="last"/>
     </group>
 
-    <group id="EditBookmarksGroup" popup="true">
+    <group id="Bookmarks" popup="true">
+      <action id="EditBookmark" class="com.intellij.ide.bookmarks.actions.EditBookmarkAction"/>
       <action id="ToggleBookmark" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkAction"/>
       <action id="ToggleBookmarkWithMnemonic" class="com.intellij.ide.bookmarks.actions.ChooseBookmarkTypeAction"/>
       <action id="ShowBookmarks" class="com.intellij.ide.bookmarks.actions.BookmarksAction"/>
       <action id="GotoNextBookmark" class="com.intellij.ide.bookmarks.actions.NextBookmarkAction"/>
       <action id="GotoPreviousBookmark" class="com.intellij.ide.bookmarks.actions.PreviousBookmarkAction"/>
-      <separator/>
 
-      <add-to-group group-id="GoToMenu" anchor="last"/>
+      <group id="Bookmarks.Goto" popup="true">
+        <action id="GotoBookmark0" class="com.intellij.ide.bookmarks.actions.GotoBookmark0Action"/>
+        <action id="GotoBookmark1" class="com.intellij.ide.bookmarks.actions.GotoBookmark1Action"/>
+        <action id="GotoBookmark2" class="com.intellij.ide.bookmarks.actions.GotoBookmark2Action"/>
+        <action id="GotoBookmark3" class="com.intellij.ide.bookmarks.actions.GotoBookmark3Action"/>
+        <action id="GotoBookmark4" class="com.intellij.ide.bookmarks.actions.GotoBookmark4Action"/>
+        <action id="GotoBookmark5" class="com.intellij.ide.bookmarks.actions.GotoBookmark5Action"/>
+        <action id="GotoBookmark6" class="com.intellij.ide.bookmarks.actions.GotoBookmark6Action"/>
+        <action id="GotoBookmark7" class="com.intellij.ide.bookmarks.actions.GotoBookmark7Action"/>
+        <action id="GotoBookmark8" class="com.intellij.ide.bookmarks.actions.GotoBookmark8Action"/>
+        <action id="GotoBookmark9" class="com.intellij.ide.bookmarks.actions.GotoBookmark9Action"/>
+        <action id="GotoBookmarkA" class="com.intellij.ide.bookmarks.actions.GotoBookmarkAAction"/>
+        <action id="GotoBookmarkB" class="com.intellij.ide.bookmarks.actions.GotoBookmarkBAction"/>
+        <action id="GotoBookmarkC" class="com.intellij.ide.bookmarks.actions.GotoBookmarkCAction"/>
+        <action id="GotoBookmarkD" class="com.intellij.ide.bookmarks.actions.GotoBookmarkDAction"/>
+        <action id="GotoBookmarkE" class="com.intellij.ide.bookmarks.actions.GotoBookmarkEAction"/>
+        <action id="GotoBookmarkF" class="com.intellij.ide.bookmarks.actions.GotoBookmarkFAction"/>
+        <action id="GotoBookmarkG" class="com.intellij.ide.bookmarks.actions.GotoBookmarkGAction"/>
+        <action id="GotoBookmarkH" class="com.intellij.ide.bookmarks.actions.GotoBookmarkHAction"/>
+        <action id="GotoBookmarkI" class="com.intellij.ide.bookmarks.actions.GotoBookmarkIAction"/>
+        <action id="GotoBookmarkJ" class="com.intellij.ide.bookmarks.actions.GotoBookmarkJAction"/>
+        <action id="GotoBookmarkK" class="com.intellij.ide.bookmarks.actions.GotoBookmarkKAction"/>
+        <action id="GotoBookmarkL" class="com.intellij.ide.bookmarks.actions.GotoBookmarkLAction"/>
+        <action id="GotoBookmarkM" class="com.intellij.ide.bookmarks.actions.GotoBookmarkMAction"/>
+        <action id="GotoBookmarkN" class="com.intellij.ide.bookmarks.actions.GotoBookmarkNAction"/>
+        <action id="GotoBookmarkO" class="com.intellij.ide.bookmarks.actions.GotoBookmarkOAction"/>
+        <action id="GotoBookmarkP" class="com.intellij.ide.bookmarks.actions.GotoBookmarkPAction"/>
+        <action id="GotoBookmarkQ" class="com.intellij.ide.bookmarks.actions.GotoBookmarkQAction"/>
+        <action id="GotoBookmarkR" class="com.intellij.ide.bookmarks.actions.GotoBookmarkRAction"/>
+        <action id="GotoBookmarkS" class="com.intellij.ide.bookmarks.actions.GotoBookmarkSAction"/>
+        <action id="GotoBookmarkT" class="com.intellij.ide.bookmarks.actions.GotoBookmarkTAction"/>
+        <action id="GotoBookmarkU" class="com.intellij.ide.bookmarks.actions.GotoBookmarkUAction"/>
+        <action id="GotoBookmarkV" class="com.intellij.ide.bookmarks.actions.GotoBookmarkVAction"/>
+        <action id="GotoBookmarkW" class="com.intellij.ide.bookmarks.actions.GotoBookmarkWAction"/>
+        <action id="GotoBookmarkX" class="com.intellij.ide.bookmarks.actions.GotoBookmarkXAction"/>
+        <action id="GotoBookmarkY" class="com.intellij.ide.bookmarks.actions.GotoBookmarkYAction"/>
+        <action id="GotoBookmarkZ" class="com.intellij.ide.bookmarks.actions.GotoBookmarkZAction"/>
+      </group>
+      <group id="Bookmarks.Toggle" popup="true">
+        <action id="ToggleBookmark0" class="com.intellij.ide.bookmarks.actions.ToggleBookmark0Action"/>
+        <action id="ToggleBookmark1" class="com.intellij.ide.bookmarks.actions.ToggleBookmark1Action"/>
+        <action id="ToggleBookmark2" class="com.intellij.ide.bookmarks.actions.ToggleBookmark2Action"/>
+        <action id="ToggleBookmark3" class="com.intellij.ide.bookmarks.actions.ToggleBookmark3Action"/>
+        <action id="ToggleBookmark4" class="com.intellij.ide.bookmarks.actions.ToggleBookmark4Action"/>
+        <action id="ToggleBookmark5" class="com.intellij.ide.bookmarks.actions.ToggleBookmark5Action"/>
+        <action id="ToggleBookmark6" class="com.intellij.ide.bookmarks.actions.ToggleBookmark6Action"/>
+        <action id="ToggleBookmark7" class="com.intellij.ide.bookmarks.actions.ToggleBookmark7Action"/>
+        <action id="ToggleBookmark8" class="com.intellij.ide.bookmarks.actions.ToggleBookmark8Action"/>
+        <action id="ToggleBookmark9" class="com.intellij.ide.bookmarks.actions.ToggleBookmark9Action"/>
+        <action id="ToggleBookmarkA" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkAAction"/>
+        <action id="ToggleBookmarkB" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkBAction"/>
+        <action id="ToggleBookmarkC" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkCAction"/>
+        <action id="ToggleBookmarkD" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkDAction"/>
+        <action id="ToggleBookmarkE" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkEAction"/>
+        <action id="ToggleBookmarkF" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkFAction"/>
+        <action id="ToggleBookmarkG" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkGAction"/>
+        <action id="ToggleBookmarkH" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkHAction"/>
+        <action id="ToggleBookmarkI" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkIAction"/>
+        <action id="ToggleBookmarkJ" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkJAction"/>
+        <action id="ToggleBookmarkK" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkKAction"/>
+        <action id="ToggleBookmarkL" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkLAction"/>
+        <action id="ToggleBookmarkM" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkMAction"/>
+        <action id="ToggleBookmarkN" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkNAction"/>
+        <action id="ToggleBookmarkO" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkOAction"/>
+        <action id="ToggleBookmarkP" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkPAction"/>
+        <action id="ToggleBookmarkQ" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkQAction"/>
+        <action id="ToggleBookmarkR" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkRAction"/>
+        <action id="ToggleBookmarkS" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkSAction"/>
+        <action id="ToggleBookmarkT" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkTAction"/>
+        <action id="ToggleBookmarkU" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkUAction"/>
+        <action id="ToggleBookmarkV" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkVAction"/>
+        <action id="ToggleBookmarkW" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkWAction"/>
+        <action id="ToggleBookmarkX" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkXAction"/>
+        <action id="ToggleBookmarkY" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkYAction"/>
+        <action id="ToggleBookmarkZ" class="com.intellij.ide.bookmarks.actions.ToggleBookmarkZAction"/>
+      </group>
+
+      <add-to-group group-id="Other.KeymapGroup"/>
     </group>
 
-    <group id="GutterMenuBookmarks">
+    <group id="EditBookmarksGroup" popup="true">
       <reference ref="ToggleBookmark"/>
       <reference ref="ToggleBookmarkWithMnemonic"/>
+      <reference ref="ShowBookmarks"/>
+      <reference ref="GotoNextBookmark"/>
+      <reference ref="GotoPreviousBookmark"/>
       <separator/>
 
-      <add-to-group group-id="EditorGutterPopupMenu" anchor="after" relative-to-action="EditorGutterVcsPopupMenu"/>
+      <add-to-group group-id="GoToMenu" anchor="last"/>
     </group>
 
     <group id="popup@BookmarkContextMenu">
+      <reference ref="EditBookmark"/>
       <reference ref="ToggleBookmark"/>
-      <action id="EditBookmark" class="com.intellij.ide.bookmarks.actions.EditBookmarkAction"/>
+      <reference ref="ToggleBookmarkWithMnemonic"/>
+      <separator/>
+
+      <add-to-group group-id="EditorGutterPopupMenu" anchor="after" relative-to-action="EditorGutterVcsPopupMenu"/>
     </group>
 
     <action id="GotoDeclarationOnly" class="com.intellij.codeInsight.navigation.actions.GotoDeclarationOnlyAction"/>
       <group id="StateWidgetMoreActionGroup" icon="AllIcons.Actions.More" popup="true" class="com.intellij.execution.segmentedRunDebugWidget.StateWidgetMoreActionGroup"/>
     </group>
 
-    <group id="Bookmarks">
-      <reference ref="ToggleBookmark"/>
-      <reference ref="ShowBookmarks"/>
-      <reference ref="GotoNextBookmark"/>
-      <reference ref="GotoPreviousBookmark"/>
-
-      <action id="GotoBookmark0" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark0Action"/>
-      <action id="GotoBookmark1" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark1Action"/>
-      <action id="GotoBookmark2" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark2Action"/>
-      <action id="GotoBookmark3" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark3Action"/>
-      <action id="GotoBookmark4" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark4Action"/>
-      <action id="GotoBookmark5" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark5Action"/>
-      <action id="GotoBookmark6" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark6Action"/>
-      <action id="GotoBookmark7" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark7Action"/>
-      <action id="GotoBookmark8" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark8Action"/>
-      <action id="GotoBookmark9" class="com.intellij.ide.bookmarks.actions.GoToMnemonicBookmarkActionBase$GotoBookmark9Action"/>
-
-      <action id="ToggleBookmark0" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark0Action"/>
-      <action id="ToggleBookmark1" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark1Action"/>
-      <action id="ToggleBookmark2" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark2Action"/>
-      <action id="ToggleBookmark3" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark3Action"/>
-      <action id="ToggleBookmark4" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark4Action"/>
-      <action id="ToggleBookmark5" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark5Action"/>
-      <action id="ToggleBookmark6" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark6Action"/>
-      <action id="ToggleBookmark7" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark7Action"/>
-      <action id="ToggleBookmark8" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark8Action"/>
-      <action id="ToggleBookmark9" class="com.intellij.ide.bookmarks.actions.ToggleNumberedBookmarkActionBase$ToggleBookmark9Action"/>
-
-      <add-to-group group-id="Other.KeymapGroup"/>
-    </group>
-
     <group id="ProjectViewPopupMenuRefactoringGroup" compact="true">
       <reference ref="RefactoringMenu"/>
     </group>