MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
GitOrigin-RevId: 28baaa027dbcf9263731f343ca08885829208ff5
This commit is contained in:
Daniil Ovchinnikov
2024-03-18 22:45:40 +01:00
committed by intellij-monorepo-bot
parent 586ddfbbd2
commit a9e1406257
9 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/modules.xml generated
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/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" />
<module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" />

1
java/java-tests/intellij.java.tests.iml
View File

@@ -87,5 +87,6 @@
<orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
<orderEntry type="module" module-name="intellij.junit.java.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.util.coroutines" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.navbar.compatibility.testFramework" scope="TEST" />
</component>
</module>

2
java/java-tests/testSrc/com/intellij/ide/navigationToolbar/JavaNavBarTest.java
View File

@@ -8,7 +8,7 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import java.util.List;
import static com.intellij.ide.navbar.tests.TestFrameworkKt.contextNavBarPathStrings;
import static com.intellij.platform.navbar.compatibility.testFramework.TestFrameworkKt.contextNavBarPathStrings;
public class JavaNavBarTest extends LightJavaCodeInsightFixtureTestCase {
@Override

4
platform/lang-impl/src/com/intellij/ide/navbar/actions/actions.kt
View File

@@ -23,6 +23,7 @@ import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiUtilCore
import com.intellij.util.containers.toArray
import org.jetbrains.annotations.VisibleForTesting
/**
* Fast extension data without selection (allows to override cut/copy/paste providers)
@@ -59,7 +60,8 @@ internal class BgtDataRule : GetDataRule {
}
}
internal fun getBgData(project: Project, selection: List<Pointer<out NavBarItem>>, dataId: String): Any? {
@VisibleForTesting
fun getBgData(project: Project, selection: List<Pointer<out NavBarItem>>, dataId: String): Any? {
val selectedItems = lazy(LazyThreadSafetyMode.NONE) {
ApplicationManager.getApplication().assertReadAccessAllowed()
selection.mapNotNull {

4
platform/lang-impl/src/com/intellij/ide/navbar/impl/DefaultNavBarItemProvider.kt
View File

@@ -19,6 +19,7 @@ import com.intellij.psi.util.PsiUtilCore.ensureValid
import com.intellij.psi.util.PsiUtilCore.getVirtualFile
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
import com.intellij.util.concurrency.annotations.RequiresReadLock
import org.jetbrains.annotations.VisibleForTesting
/**
* Delegates old implementations
@@ -177,7 +178,8 @@ internal fun ensurePsiFromExtensionIsValid(psi: PsiElement, message: String, cla
}
}
internal fun compatibilityNavBarItem(o: Any, ext: NavBarModelExtension?): NavBarItem? {
@VisibleForTesting
fun compatibilityNavBarItem(o: Any, ext: NavBarModelExtension?): NavBarItem? {
return when (o) {
is Project -> {
ProjectNavBarItem(o)

16
platform/navbar.compatibility/testFramework/intellij.platform.navbar.compatibility.testFramework.iml Normal file
View File

@@ -0,0 +1,16 @@
<?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$/src" isTestSource="false" packagePrefix="com.intellij.platform.navbar.compatibility.testFramework" />
</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.ui" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.navbar.backend" exported="" />
<orderEntry type="module" module-name="intellij.platform.navbar.ide" exported="" />
</component>
</module>

3
platform/lang-impl/src/com/intellij/ide/navbar/tests/testFramework.kt → platform/navbar.compatibility/testFramework/src/testFramework.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.ide.navbar.tests
package com.intellij.platform.navbar.compatibility.testFramework
import com.intellij.ide.navbar.actions.getBgData
import com.intellij.ide.navbar.impl.DefaultNavBarItem
@@ -9,7 +9,6 @@ import com.intellij.openapi.actionSystem.DataKey
import com.intellij.openapi.project.Project
import com.intellij.platform.navbar.NavBarItemPresentation
import com.intellij.platform.navbar.backend.NavBarItem
import com.intellij.platform.navbar.backend.NavBarItemProvider
import com.intellij.platform.navbar.backend.impl.children
import com.intellij.platform.navbar.backend.impl.pathToItem
import com.intellij.platform.navbar.ide.contextModel

1
plugins/kotlin/idea/tests/kotlin.idea.tests.iml
View File

@@ -138,5 +138,6 @@
<orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
<orderEntry type="module" module-name="kotlin.ide" scope="TEST" />
<orderEntry type="module" module-name="kotlin.bundled-compiler-plugins-support" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.navbar.compatibility.testFramework" scope="TEST" />
</component>
</module>

2
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigationToolbar/AbstractKotlinNavBarTest.kt
View File

@@ -2,8 +2,8 @@
package org.jetbrains.kotlin.idea.navigationToolbar
import com.intellij.ide.navbar.tests.contextNavBarPathStrings
import com.intellij.openapi.editor.ex.EditorEx
import com.intellij.platform.navbar.compatibility.testFramework.contextNavBarPathStrings
import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase