IJPL-850 extract intellij.platform.navbar.compatibility.ide module

GitOrigin-RevId: e79239a85182d6b9f99c0254b4528d5736dfbace
2026-09-27 10:03:11 +07:00 · 2024-03-29 18:12:43 +00:00
parent d14c7271b0
commit 8a1cf90bc0
17 changed files with 86 additions and 19 deletions
@@ -1017,6 +1017,7 @@
      <module fileurl="file://$PROJECT_DIR$/platform/navbar/shared/intellij.platform.navbar.iml" filepath="$PROJECT_DIR$/platform/navbar/shared/intellij.platform.navbar.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/navbar/backend/intellij.platform.navbar.backend.iml" filepath="$PROJECT_DIR$/platform/navbar/backend/intellij.platform.navbar.backend.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/navbar.compatibility/backend/intellij.platform.navbar.compatibility.backend.iml" filepath="$PROJECT_DIR$/platform/navbar.compatibility/backend/intellij.platform.navbar.compatibility.backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/navbar.compatibility/ide/intellij.platform.navbar.compatibility.ide.iml" filepath="$PROJECT_DIR$/platform/navbar.compatibility/ide/intellij.platform.navbar.compatibility.ide.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/navbar.compatibility/monolith/intellij.platform.navbar.compatibility.monolith.iml" filepath="$PROJECT_DIR$/platform/navbar.compatibility/monolith/intellij.platform.navbar.compatibility.monolith.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/navbar.compatibility/testFramework/intellij.platform.navbar.compatibility.testFramework.iml" filepath="$PROJECT_DIR$/platform/navbar.compatibility/testFramework/intellij.platform.navbar.compatibility.testFramework.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/navbar/ide/intellij.platform.navbar.ide.iml" filepath="$PROJECT_DIR$/platform/navbar/ide/intellij.platform.navbar.ide.iml" />
@@ -6,5 +6,6 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.navbar.ide" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.navbar.compatibility.ide" scope="RUNTIME" />
  </component>
 </module>
@@ -9,7 +9,7 @@ import com.intellij.openapi.actionSystem.DataProvider
 *
 * TODO consider a new extension for that OR new API for cut/copy/paste
 */
-internal fun extensionData(dataId: String): Any? {
+fun extensionData(dataId: String): Any? {
  return extensionData(dataId, emptyDataProvider)
 }

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.platform.navbar.compatibility.ide" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.lang.core" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.navbar.ide" />
+  </component>
+</module>
@@ -0,0 +1,21 @@
+<idea-plugin package="com.intellij.platform.navbar.compatibility.ide">
+  <!--<dependencies>-->
+  <!--  <module name="intellij.platform.navbar.ide"/>-->
+  <!--</dependencies>-->
+  <extensions defaultExtensionNs="com.intellij">
+    <getDataRule key="cutProvider" type="fast"
+                 implementationClass="com.intellij.platform.navbar.compatibility.ide.CutProviderDataRule"/>
+    <getDataRule key="copyProvider" type="fast"
+                 implementationClass="com.intellij.platform.navbar.compatibility.ide.CopyProviderDataRule"/>
+    <getDataRule key="pasteProvider" type="fast"
+                 implementationClass="com.intellij.platform.navbar.compatibility.ide.PasteProviderDataRule"/>
+    <selectInTarget implementation="com.intellij.platform.navbar.compatibility.ide.SelectInNavBarTarget"/>
+  </extensions>
+  <actions resource-bundle="messages.NavBarIdeBundle">
+    <group id="NavBarContextMenu" class="com.intellij.platform.navbar.compatibility.ide.NavBarContextMenuActionGroup"/>
+    <action id="ShowNavBar" class="com.intellij.platform.navbar.compatibility.ide.ShowNavBarAction">
+      <add-to-group group-id="EditorPopupMenu.GoTo" anchor="first"/>
+      <add-to-group group-id="GoToCodeGroup" relative-to-action="SelectIn" anchor="after"/>
+    </action>
+  </actions>
+</idea-plugin>
@@ -1,5 +1,5 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.ide.navbar.ui
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.platform.navbar.compatibility.ide

 import com.intellij.ide.navigationToolbar.NavBarModelExtension
 import com.intellij.ide.ui.customization.CustomActionsSchema
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.ide.navigationToolbar;
+package com.intellij.platform.navbar.compatibility.ide;

 import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeBundle;
@@ -1,9 +1,8 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.ide.navigationToolbar;
+package com.intellij.platform.navbar.compatibility.ide;

 import com.intellij.ide.ui.NavBarLocation;
 import com.intellij.ide.ui.UISettings;
-import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification;
 import com.intellij.openapi.project.DumbAware;
@@ -11,6 +10,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.platform.navbar.ide.NavBarService;
 import org.jetbrains.annotations.NotNull;

+import static com.intellij.platform.navbar.ide.NavBarIdeBundle.messagePointer;
 import static com.intellij.platform.navbar.ide.NavBarServiceKt.isNavbarShown;

 /**
@@ -45,7 +45,7 @@ final class ShowNavBarAction extends AnAction implements DumbAware, PopupAction,

    // see RIDER-15982
    if (!ActionPlaces.isMainMenuOrActionSearch(e.getPlace())) {
-      e.getPresentation().setText(ActionsBundle.messagePointer("action.ShowNavBar.ShortText"));
+      e.getPresentation().setText(messagePointer("action.ShowNavBar.ShortText"));
    }
  }

@@ -0,0 +1,5 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+@Internal
+package com.intellij.platform.navbar.compatibility.ide;
+
+import org.jetbrains.annotations.ApiStatus.Internal;
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.ide.navbar.ide
+package com.intellij.platform.navbar.compatibility.ide

 import com.intellij.ide.CopyPasteDelegator
 import com.intellij.ide.CopyPasteSupport
@@ -1,3 +1,5 @@
+action.ShowNavBar.text=_Jump to Navigation Bar
+action.ShowNavBar.ShortText=Navigation Bar
 group.NavBarActions.text=Navigation Bar Actions
 action.NavBar-selectHome.text=Select First Item
 action.NavBar-selectEnd.text=Select Last Item
@@ -0,0 +1,30 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+@file:JvmName("NavBarIdeBundle")
+@file:Internal
+
+package com.intellij.platform.navbar.ide
+
+import com.intellij.DynamicBundle
+import org.jetbrains.annotations.ApiStatus.Internal
+import org.jetbrains.annotations.Nls
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.annotations.PropertyKey
+import java.lang.invoke.MethodHandles
+import java.util.function.Supplier
+
+private const val BUNDLE_FQN: @NonNls String = "messages.NavBarIdeBundle"
+private val BUNDLE = DynamicBundle(MethodHandles.lookup().lookupClass(), BUNDLE_FQN)
+
+fun message(
+  key: @PropertyKey(resourceBundle = BUNDLE_FQN) String,
+  vararg params: Any
+): @Nls String {
+  return BUNDLE.getMessage(key, *params)
+}
+
+fun messagePointer(
+  key: @PropertyKey(resourceBundle = BUNDLE_FQN) String,
+  vararg params: Any
+): Supplier<String> {
+  return BUNDLE.getLazyMessage(key, *params)
+}
@@ -1461,9 +1461,6 @@ action.IntegrateFiles.description=Integrate selected files or directories
 action.Vcs.IntegrateProject.text=Inte_grate Project
 action.Vcs.IntegrateProject.description=Integrate project

-action.ShowNavBar.text=_Jump to Navigation Bar
-action.ShowNavBar.ShortText=Navigation Bar
-
 group.ProjectView.ToolWindow.SecondaryActions.text=Project View Options
 group.ProjectView.ToolWindow.Appearance.Actions.text=Tree Appearance
 action.ProjectView.AbbreviatePackageNames.text=Abbreviate Qualified Package Names
@@ -697,10 +697,6 @@
    <applicationService serviceInterface="com.intellij.modcommand.ModCommandExecutor"
                        serviceImplementation="com.intellij.lang.impl.modcommand.ModCommandExecutorImpl" overrides="true"/>

-    <getDataRule key="cutProvider" type="fast" implementationClass="com.intellij.ide.navbar.ide.CutProviderDataRule"/>
-    <getDataRule key="copyProvider" type="fast" implementationClass="com.intellij.ide.navbar.ide.CopyProviderDataRule"/>
-    <getDataRule key="pasteProvider" type="fast" implementationClass="com.intellij.ide.navbar.ide.PasteProviderDataRule"/>
-
    <statistician key="completion" implementationClass="com.intellij.codeInsight.completion.DefaultCompletionStatistician" order="last"/>

    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.OpenedInEditorWeigher" id="openedInEditor"/>
@@ -752,7 +748,6 @@
    <gotoRelatedProvider implementation="com.intellij.ide.actions.RelatedItemLineMarkerGotoAdapter"/>

    <selectInTarget implementation="com.intellij.ide.impl.ProjectViewSelectInGroupTarget"/>
-    <selectInTarget implementation="com.intellij.ide.navigationToolbar.SelectInNavBarTarget"/>
    <selectInTarget implementation="com.intellij.ide.impl.StructureViewSelectInTarget"/>
    <selectInTarget implementation="com.intellij.ide.impl.ProjectViewSelectInExplorerTarget"/>

@@ -10,6 +10,7 @@
  <!-- should be here, otherwise not loaded in tests (in unit test mode, the platform prefix is `PlatformLangXml) -->
  <content>
    <module name="intellij.platform.navbar.compatibility.backend"/>
+    <module name="intellij.platform.navbar.compatibility.ide"/>
    <module name="intellij.platform.navbar.compatibility.monolith"/>
    <module name="intellij.platform.settings.local"/>
  </content>
@@ -447,7 +447,6 @@
    <group id="GoToCodeGroup">
      <separator/>
      <action id="SelectIn" class="com.intellij.ide.actions.SelectInAction"/>
-      <action id="ShowNavBar" class="com.intellij.ide.navigationToolbar.ShowNavBarAction"/>
      <separator/>
      <action id="GotoDeclaration" class="com.intellij.codeInsight.navigation.actions.GotoDeclarationAction">
        <override-text place="MainMenu"/>
@@ -999,7 +998,6 @@
    <group id="EditorPopupMenu1.FindRefactor" compact="true">
      <reference ref="FindUsages"/>
      <group id="EditorPopupMenu.GoTo" popup="true">
-        <reference ref="ShowNavBar"/>
        <reference ref="GotoDeclaration"/>
        <reference ref="GotoImplementation"/>
        <reference ref="GotoTypeDeclaration"/>
@@ -1672,6 +1672,5 @@
              class="com.intellij.ide.actions.searcheverywhere.CloseSearchEverywherePreview"
              icon="AllIcons.Actions.CloseDarkGrey"/>
    </group>
-    <group id="NavBarContextMenu" class="com.intellij.ide.navbar.ui.NavBarContextMenuActionGroup"/>
  </actions>
 </idea-plugin>