MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
GitOrigin-RevId: e31d0cf8857ae11f85d91de5714bb501aebc6f5f
This commit is contained in:
Daniil Ovchinnikov
2024-03-25 15:33:50 +00:00
committed by intellij-monorepo-bot
parent ed7947f51c
commit c2fe9bba5c
8 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1
View File
@@ -1012,6 +1012,7 @@
<module fileurl="file://$PROJECT_DIR$/platform/ml-impl/intellij.platform.ml.impl.iml" filepath="$PROJECT_DIR$/platform/ml-impl/intellij.platform.ml.impl.iml" />
<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/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" />
<module fileurl="file://$PROJECT_DIR$/platform/navbar/vm/intellij.platform.navbar.vm.iml" filepath="$PROJECT_DIR$/platform/navbar/vm/intellij.platform.navbar.vm.iml" />
platform/lang-impl/src/com/intellij/ide/navbar/ide/IdeNavBarVmItem.kt
+2 -2
View File
@@ -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 <T> IdeNavBarVmItem.fetch(selector: NavBarItem.() -> T): T?
}
}
internal fun List<NavBarItem>.toVmItems(): List<NavBarVmItem> {
fun List<NavBarItem>.toVmItems(): List<NavBarVmItem> {
return map {
IdeNavBarVmItem(it)
}
platform/lang-impl/src/com/intellij/ide/navbar/impl/DefaultNavBarItem.kt
+1 -4
View File
@@ -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<out T>(val data: T) : NavBarItem {
}
internal class ProjectNavBarItem(data: Project) : DefaultNavBarItem<Project>(data), Pointer<NavBarItem> {
class ProjectNavBarItem(data: Project) : DefaultNavBarItem<Project>(data), Pointer<NavBarItem> {
override fun createPointer(): Pointer<out NavBarItem> = this
platform/navbar.compatibility/monolith/intellij.platform.navbar.compatibility.monolith.iml
+18
View File
@@ -0,0 +1,18 @@
<?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.monolith" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<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.impl" />
<orderEntry type="module" module-name="intellij.platform.navbar.backend" />
<orderEntry type="module" module-name="intellij.platform.navbar.ide" />
</component>
</module>
platform/navbar.compatibility/monolith/resources/intellij.platform.navbar.compatibility.monolith.xml
+7
View File
@@ -0,0 +1,7 @@
<idea-plugin package="com.intellij.platform.navbar.compatibility.monolith">
<extensions defaultExtensionNs="com.intellij">
<!--suppress PluginXmlValidity -->
<projectService serviceInterface="com.intellij.platform.navbar.ide.NavBarServiceDelegate"
serviceImplementation="com.intellij.platform.navbar.compatibility.monolith.MonolithNavbarServiceDelegate"/>
</extensions>
</idea-plugin>
platform/lang-impl/src/com/intellij/ide/navbar/ide/MonolithNavBarServiceDelegate.kt → platform/navbar.compatibility/monolith/src/MonolithNavBarServiceDelegate.kt
+4 -1
View File
@@ -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
platform/platform-resources/src/META-INF/LangExtensions.xml
-2
View File
@@ -694,8 +694,6 @@
<ideRootPaneNorth implementation="com.intellij.ide.navigationToolbar.experimental.NewToolbarRootPaneExtension" order="first"/>
<navbar implementation="com.intellij.ide.navigationToolbar.DefaultNavBarExtension" id="defaultNavbar" order="last"/>
<projectService serviceInterface="com.intellij.platform.navbar.ide.NavBarServiceDelegate"
serviceImplementation="com.intellij.ide.navbar.ide.MonolithNavbarServiceDelegate"/>
<applicationService serviceInterface="com.intellij.modcommand.ModCommandExecutor"
serviceImplementation="com.intellij.lang.impl.modcommand.ModCommandExecutorImpl" overrides="true"/>
platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+1
View File
@@ -9,6 +9,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.monolith"/>
<module name="intellij.platform.settings.local"/>
</content>