diff --git a/.idea/modules.xml b/.idea/modules.xml index 4389cc3983cb..8748bf7298fa 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1016,6 +1016,7 @@ + diff --git a/platform/navbar.compatibility/backend/intellij.platform.navbar.compatibility.backend.iml b/platform/navbar.compatibility/backend/intellij.platform.navbar.compatibility.backend.iml index 2a4cd8f3c813..c00059f2ab21 100644 --- a/platform/navbar.compatibility/backend/intellij.platform.navbar.compatibility.backend.iml +++ b/platform/navbar.compatibility/backend/intellij.platform.navbar.compatibility.backend.iml @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/platform/navbar.compatibility/backend/resources/intellij.platform.navbar.compatibility.backend.xml b/platform/navbar.compatibility/backend/resources/intellij.platform.navbar.compatibility.backend.xml index 13270ebbf5b1..c1b16379e6ec 100644 --- a/platform/navbar.compatibility/backend/resources/intellij.platform.navbar.compatibility.backend.xml +++ b/platform/navbar.compatibility/backend/resources/intellij.platform.navbar.compatibility.backend.xml @@ -1,7 +1,8 @@ - - - + + + + diff --git a/platform/navbar.compatibility/backend/src/BgtDataRule.kt b/platform/navbar.compatibility/backend/src/BgtDataRule.kt index c10c0d579ed1..8db21bd1e25e 100644 --- a/platform/navbar.compatibility/backend/src/BgtDataRule.kt +++ b/platform/navbar.compatibility/backend/src/BgtDataRule.kt @@ -2,7 +2,6 @@ package com.intellij.platform.navbar.compatibility.backend import com.intellij.ide.impl.dataRules.GetDataRule -import com.intellij.ide.navbar.actions.extensionData import com.intellij.ide.projectView.impl.ProjectRootsUtil import com.intellij.ide.util.DeleteHandler.DefaultDeleteProvider import com.intellij.model.Pointer @@ -14,6 +13,7 @@ import com.intellij.openapi.roots.ui.configuration.actions.ModuleDeleteProvider import com.intellij.openapi.vfs.VirtualFile import com.intellij.platform.navbar.NavBarVmItem import com.intellij.platform.navbar.backend.NavBarItem +import com.intellij.platform.navbar.compatibility.extensionData import com.intellij.pom.Navigatable import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement diff --git a/platform/navbar.compatibility/ide/intellij.platform.navbar.compatibility.ide.iml b/platform/navbar.compatibility/ide/intellij.platform.navbar.compatibility.ide.iml index e16a6616278f..586b9ca8279b 100644 --- a/platform/navbar.compatibility/ide/intellij.platform.navbar.compatibility.ide.iml +++ b/platform/navbar.compatibility/ide/intellij.platform.navbar.compatibility.ide.iml @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/platform/navbar.compatibility/ide/resources/intellij.platform.navbar.compatibility.ide.xml b/platform/navbar.compatibility/ide/resources/intellij.platform.navbar.compatibility.ide.xml index bfcdcb1dda4d..37db1267f48b 100644 --- a/platform/navbar.compatibility/ide/resources/intellij.platform.navbar.compatibility.ide.xml +++ b/platform/navbar.compatibility/ide/resources/intellij.platform.navbar.compatibility.ide.xml @@ -1,7 +1,8 @@ - - - + + + + diff --git a/platform/navbar.compatibility/ide/src/rules.kt b/platform/navbar.compatibility/ide/src/rules.kt index e34d8aacd6df..1c72f66e5323 100644 --- a/platform/navbar.compatibility/ide/src/rules.kt +++ b/platform/navbar.compatibility/ide/src/rules.kt @@ -4,11 +4,11 @@ package com.intellij.platform.navbar.compatibility.ide import com.intellij.ide.CopyPasteDelegator import com.intellij.ide.CopyPasteSupport import com.intellij.ide.impl.dataRules.GetDataRule -import com.intellij.ide.navbar.actions.extensionData import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataProvider import com.intellij.openapi.actionSystem.PlatformCoreDataKeys import com.intellij.openapi.actionSystem.PlatformDataKeys +import com.intellij.platform.navbar.compatibility.extensionData import javax.swing.JComponent internal class CutProviderDataRule : GetDataRule { diff --git a/platform/navbar.compatibility/shared/intellij.platform.navbar.compatibility.iml b/platform/navbar.compatibility/shared/intellij.platform.navbar.compatibility.iml new file mode 100644 index 000000000000..6d66ecb127df --- /dev/null +++ b/platform/navbar.compatibility/shared/intellij.platform.navbar.compatibility.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/navbar.compatibility/shared/resources/intellij.platform.navbar.compatibility.xml b/platform/navbar.compatibility/shared/resources/intellij.platform.navbar.compatibility.xml new file mode 100644 index 000000000000..5f591d4dd8bc --- /dev/null +++ b/platform/navbar.compatibility/shared/resources/intellij.platform.navbar.compatibility.xml @@ -0,0 +1,2 @@ + + diff --git a/platform/lang-impl/src/com/intellij/ide/navbar/actions/extensions.kt b/platform/navbar.compatibility/shared/src/extensions.kt similarity index 94% rename from platform/lang-impl/src/com/intellij/ide/navbar/actions/extensions.kt rename to platform/navbar.compatibility/shared/src/extensions.kt index 5acda4c29854..482ae91ddc34 100644 --- a/platform/lang-impl/src/com/intellij/ide/navbar/actions/extensions.kt +++ b/platform/navbar.compatibility/shared/src/extensions.kt @@ -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.actions +package com.intellij.platform.navbar.compatibility import com.intellij.ide.navigationToolbar.NavBarModelExtension import com.intellij.openapi.actionSystem.DataProvider diff --git a/platform/navbar.compatibility/shared/src/package-info.java b/platform/navbar.compatibility/shared/src/package-info.java new file mode 100644 index 000000000000..4b2752db4feb --- /dev/null +++ b/platform/navbar.compatibility/shared/src/package-info.java @@ -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; + +import org.jetbrains.annotations.ApiStatus.Internal; diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml index 0fa89da5353c..7efd006e033d 100644 --- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml @@ -9,6 +9,7 @@ +