diff --git a/.idea/modules.xml b/.idea/modules.xml index 5543eb66b35c..096b14b6a71f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1012,6 +1012,7 @@ + diff --git a/platform/lang-impl/src/com/intellij/ide/navbar/ide/IdeNavBarVmItem.kt b/platform/lang-impl/src/com/intellij/ide/navbar/ide/IdeNavBarVmItem.kt index 2733e15f82e8..acfd94cecf71 100644 --- a/platform/lang-impl/src/com/intellij/ide/navbar/ide/IdeNavBarVmItem.kt +++ b/platform/lang-impl/src/com/intellij/ide/navbar/ide/IdeNavBarVmItem.kt @@ -12,7 +12,7 @@ import com.intellij.platform.navbar.backend.impl.children import com.intellij.util.concurrency.ThreadingAssertions import com.intellij.util.concurrency.annotations.RequiresReadLock -internal class IdeNavBarVmItem @RequiresReadLock constructor( +class IdeNavBarVmItem @RequiresReadLock constructor( item: NavBarItem, ) : NavBarVmItem { @@ -70,7 +70,7 @@ private suspend fun IdeNavBarVmItem.fetch(selector: NavBarItem.() -> T): T? } } -internal fun List.toVmItems(): List { +fun List.toVmItems(): List { return map { IdeNavBarVmItem(it) } diff --git a/platform/lang-impl/src/com/intellij/ide/navbar/impl/DefaultNavBarItem.kt b/platform/lang-impl/src/com/intellij/ide/navbar/impl/DefaultNavBarItem.kt index 3c818ca08ae3..f64d1f866161 100644 --- a/platform/lang-impl/src/com/intellij/ide/navbar/impl/DefaultNavBarItem.kt +++ b/platform/lang-impl/src/com/intellij/ide/navbar/impl/DefaultNavBarItem.kt @@ -5,8 +5,6 @@ import com.intellij.icons.AllIcons import com.intellij.ide.navigationToolbar.NavBarModelExtension import com.intellij.ide.projectView.ProjectView import com.intellij.ide.projectView.impl.ProjectRootsUtil -import com.intellij.injected.editor.VirtualFileWindow -import com.intellij.lang.LangBundle import com.intellij.model.Pointer import com.intellij.model.Pointer.hardPointer import com.intellij.openapi.editor.colors.CodeInsightColors.ERRORS_ATTRIBUTES @@ -36,7 +34,6 @@ import com.intellij.refactoring.suggested.createSmartPointer import com.intellij.ui.SimpleTextAttributes import com.intellij.ui.SimpleTextAttributes.* import com.intellij.util.IconUtil -import com.intellij.util.asSafely import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import com.intellij.util.concurrency.annotations.RequiresReadLock import com.intellij.util.ui.JBUI @@ -80,7 +77,7 @@ open class DefaultNavBarItem(val data: T) : NavBarItem { } -internal class ProjectNavBarItem(data: Project) : DefaultNavBarItem(data), Pointer { +class ProjectNavBarItem(data: Project) : DefaultNavBarItem(data), Pointer { override fun createPointer(): Pointer = this diff --git a/platform/navbar.compatibility/monolith/intellij.platform.navbar.compatibility.monolith.iml b/platform/navbar.compatibility/monolith/intellij.platform.navbar.compatibility.monolith.iml new file mode 100644 index 000000000000..5d44c61fed22 --- /dev/null +++ b/platform/navbar.compatibility/monolith/intellij.platform.navbar.compatibility.monolith.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/navbar.compatibility/monolith/resources/intellij.platform.navbar.compatibility.monolith.xml b/platform/navbar.compatibility/monolith/resources/intellij.platform.navbar.compatibility.monolith.xml new file mode 100644 index 000000000000..12988032e561 --- /dev/null +++ b/platform/navbar.compatibility/monolith/resources/intellij.platform.navbar.compatibility.monolith.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/platform/lang-impl/src/com/intellij/ide/navbar/ide/MonolithNavBarServiceDelegate.kt b/platform/navbar.compatibility/monolith/src/MonolithNavBarServiceDelegate.kt similarity index 90% rename from platform/lang-impl/src/com/intellij/ide/navbar/ide/MonolithNavBarServiceDelegate.kt rename to platform/navbar.compatibility/monolith/src/MonolithNavBarServiceDelegate.kt index 86fc619e413d..2d33789b02e9 100644 --- a/platform/lang-impl/src/com/intellij/ide/navbar/ide/MonolithNavBarServiceDelegate.kt +++ b/platform/navbar.compatibility/monolith/src/MonolithNavBarServiceDelegate.kt @@ -1,7 +1,10 @@ // 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.monolith import com.intellij.codeInsight.navigation.actions.navigateRequest +import com.intellij.ide.navbar.ide.IdeNavBarVmItem +import com.intellij.ide.navbar.ide.fireOnFileChanges +import com.intellij.ide.navbar.ide.toVmItems import com.intellij.ide.navbar.impl.ProjectNavBarItem import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.EDT diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index 8d02cf38f9de..fe1fd49e3411 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -694,8 +694,6 @@ - diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml index 151232499a7f..e6cd43b9771d 100644 --- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml @@ -9,6 +9,7 @@ +