MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

intellij.platform.navbar.frontend.compatibility -> intellij.platform.navbar.frontend

Browse Source 
- `intellij.platform.navbar.frontend` becomes v2 module;
- `.compatibility` is merged into it.

GitOrigin-RevId: f20055b1b6ecec2376a908f8e489b1670917dacb
This commit is contained in:
Daniil Ovchinnikov
2024-06-23 15:46:18 +02:00
committed by intellij-monorepo-bot
parent c88e3e1f13
commit b0c124a5a7
18 changed files with 20 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/modules.xml generated
View File

@@ -675,7 +675,6 @@
<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/shared/compatibility/intellij.platform.navbar.compatibility.iml" filepath="$PROJECT_DIR$/platform/navbar/shared/compatibility/intellij.platform.navbar.compatibility.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/navbar/frontend/intellij.platform.navbar.frontend.iml" filepath="$PROJECT_DIR$/platform/navbar/frontend/intellij.platform.navbar.frontend.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/navbar/frontend/compatibility/intellij.platform.navbar.frontend.compatibility.iml" filepath="$PROJECT_DIR$/platform/navbar/frontend/compatibility/intellij.platform.navbar.frontend.compatibility.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/navbar/monolith/intellij.platform.navbar.monolith.iml" filepath="$PROJECT_DIR$/platform/navbar/monolith/intellij.platform.navbar.monolith.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml" filepath="$PROJECT_DIR$/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" />

2
platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
View File

@@ -75,7 +75,7 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
"intellij.platform.runtime.product",
"intellij.platform.bootstrap",
"intellij.platform.navbar.frontend",
"intellij.platform.navbar",
"intellij.relaxng",
"intellij.json",

1
platform/execution.serviceView/intellij.platform.execution.serviceView.iml
View File

@@ -19,6 +19,5 @@
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.execution.impl" />
<orderEntry type="module" module-name="intellij.platform.navbar.frontend" />
<orderEntry type="module" module-name="intellij.platform.navbar.frontend.compatibility" scope="RUNTIME" />
</component>
</module>

2
platform/execution.serviceView/resources/intellij.platform.execution.serviceView.xml
View File

@@ -1,6 +1,6 @@
<idea-plugin package="com.intellij.platform.execution.serviceView">
<dependencies>
<module name="intellij.platform.navbar.frontend.compatibility"/>
<module name="intellij.platform.navbar.frontend"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij">
<actionPromoter implementation="com.intellij.platform.execution.serviceView.ServiceViewActionPromoter"/>

1
platform/main/intellij.platform.frontend.main/intellij.platform.frontend.main.iml
View File

@@ -7,6 +7,5 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.main" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.navbar.frontend" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.navbar.frontend.compatibility" scope="RUNTIME" />
</component>
</module>

0
platform/navbar/frontend/compatibility/api-dump.txt
View File

18
platform/navbar/frontend/compatibility/intellij.platform.navbar.frontend.compatibility.iml
View File

@@ -1,18 +0,0 @@
<?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.frontend.compatibility" />
</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.frontend" />
<orderEntry type="module" module-name="intellij.platform.navbar.compatibility" />
</component>
</module>

17
platform/navbar/frontend/compatibility/resources/intellij.platform.navbar.frontend.compatibility.xml
View File

@@ -1,17 +0,0 @@
<idea-plugin package="com.intellij.platform.navbar.frontend.compatibility">
<dependencies>
<!--<module name="intellij.platform.navbar.frontend"/>-->
<module name="intellij.platform.navbar.compatibility"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij">
<uiDataRule implementation="com.intellij.platform.navbar.frontend.compatibility.NavBarUiDataRule" />
<selectInTarget implementation="com.intellij.platform.navbar.frontend.compatibility.SelectInNavBarTarget"/>
</extensions>
<actions resource-bundle="messages.NavBarFrontendBundle">
<group id="NavBarContextMenu" class="com.intellij.platform.navbar.frontend.compatibility.NavBarContextMenuActionGroup"/>
<action id="ShowNavBar" class="com.intellij.platform.navbar.frontend.compatibility.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>

5
platform/navbar/frontend/compatibility/src/package-info.java
View File

@@ -1,5 +0,0 @@
// 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.frontend.compatibility;
import org.jetbrains.annotations.ApiStatus.Internal;

1
platform/navbar/frontend/intellij.platform.navbar.frontend.iml
View File

@@ -22,5 +22,6 @@
<orderEntry type="module" module-name="intellij.platform.navbar" exported="" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.navbar.compatibility" />
</component>
</module>

10
platform/navbar/frontend/resources/intellij.platform.navbar.frontend.xml
View File

@@ -1,7 +1,12 @@
<idea-plugin package="com.intellij.platform.navbar.frontend">
<dependencies>
<module name="intellij.platform.navbar.compatibility"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij">
<!--suppress PluginXmlDynamicPlugin -->
<ideRootPaneNorth implementation="com.intellij.platform.navbar.frontend.NavBarRootPaneExtension"/>
<uiDataRule implementation="com.intellij.platform.navbar.frontend.actions.NavBarUiDataRule" />
<selectInTarget implementation="com.intellij.platform.navbar.frontend.actions.SelectInNavBarTarget"/>
</extensions>
<actions resource-bundle="messages.NavBarFrontendBundle">
<group id="NavBarActions">
@@ -14,5 +19,10 @@
<action id="NavBar-return" class="com.intellij.platform.navbar.frontend.actions.NavBarActions$Enter" use-shortcut-of="EditorEnter"/>
<add-to-group group-id="Other.KeymapGroup"/>
</group>
<group id="NavBarContextMenu" class="com.intellij.platform.navbar.frontend.actions.NavBarContextMenuActionGroup"/>
<action id="ShowNavBar" class="com.intellij.platform.navbar.frontend.actions.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>

2
platform/navbar/frontend/compatibility/src/NavBarContextMenuActionGroup.kt → platform/navbar/frontend/src/actions/NavBarContextMenuActionGroup.kt
View File

@@ -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.platform.navbar.frontend.compatibility
package com.intellij.platform.navbar.frontend.actions
import com.intellij.ide.navigationToolbar.NavBarModelExtension
import com.intellij.ide.ui.customization.CustomActionsSchema

11
platform/navbar/frontend/compatibility/src/NavBarUiDataRule.kt → platform/navbar/frontend/src/actions/NavBarUiDataRule.kt
View File

@@ -1,15 +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.platform.navbar.frontend.compatibility
package com.intellij.platform.navbar.frontend.actions
import com.intellij.ide.CopyPasteDelegator
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.actionSystem.DataKey
import com.intellij.openapi.actionSystem.DataProvider
import com.intellij.openapi.actionSystem.DataSink
import com.intellij.openapi.actionSystem.DataSnapshot
import com.intellij.openapi.actionSystem.PlatformCoreDataKeys
import com.intellij.openapi.actionSystem.PlatformDataKeys
import com.intellij.openapi.actionSystem.UiDataRule
import com.intellij.openapi.actionSystem.*
import com.intellij.platform.navbar.NavBarVmItem
import com.intellij.platform.navbar.compatibility.extensionData
import javax.swing.JComponent

2
platform/navbar/frontend/compatibility/src/SelectInNavBarTarget.java → platform/navbar/frontend/src/actions/SelectInNavBarTarget.java
View File

@@ -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.platform.navbar.frontend.compatibility;
package com.intellij.platform.navbar.frontend.actions;
import com.intellij.ide.DataManager;
import com.intellij.ide.IdeBundle;

2
platform/navbar/frontend/compatibility/src/ShowNavBarAction.java → platform/navbar/frontend/src/actions/ShowNavBarAction.java
View File

@@ -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.platform.navbar.frontend.compatibility;
package com.intellij.platform.navbar.frontend.actions;
import com.intellij.ide.ui.NavBarLocation;
import com.intellij.ide.ui.UISettings;

1
platform/navbar/monolith/resources/intellij.platform.navbar.monolith.xml
View File

@@ -1,5 +1,6 @@
<idea-plugin package="com.intellij.platform.navbar.monolith">
<dependencies>
<module name="intellij.platform.navbar.frontend"/>
<module name="intellij.platform.navbar.backend"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij">

1
platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
View File

@@ -175,5 +175,4 @@
<xi:include href="/META-INF/ExternalSystemDependencyUpdater.xml">
<xi:fallback/>
</xi:include>
<xi:include href="intellij.platform.navbar.frontend.xml"/>
</idea-plugin>

2
platform/platform-resources/src/META-INF/essential-modules.xml
View File

@@ -8,7 +8,7 @@
<!-- todo navbar is not essential-->
<module name="intellij.platform.navbar.compatibility"/>
<module name="intellij.platform.navbar.backend"/>
<module name="intellij.platform.navbar.frontend.compatibility"/>
<module name="intellij.platform.navbar.frontend"/>
<module name="intellij.platform.navbar.monolith"/>
<module name="intellij.platform.clouds"/>
<module name="intellij.platform.execution.dashboard"/>