azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ExtensionTestUtil compilation for 191; CustomUsageSearcherTest compilation for 201

Browse Source 
Relates to #KT-36657
This commit is contained in:
Vladimir Dolzhenko
2020-03-13 14:41:38 +01:00
parent 57fd449288
commit 0af61293d5
5 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/findUsages/CustomUsageSearcherTest.kt
+20 -11
View File
@@ -5,21 +5,30 @@
package org.jetbrains.kotlin.findUsages
import com.intellij.find.findUsages.CustomUsageSearcher
import com.intellij.find.findUsages.FindUsagesOptions
import com.intellij.psi.PsiElement
import com.intellij.usageView.UsageInfo
import com.intellij.usages.Usage
import com.intellij.usages.UsageInfo2UsageAdapter
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.maskExtensions
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase
import org.jetbrains.kotlin.idea.util.application.runReadAction
class CustomUsageSearcherTest : KotlinLightCodeInsightFixtureTestCaseBase() {
fun testAddCustomUsagesForKotlin() {
// TODO("[VD] There are diff API for ExtensionTestUtil in 191, 192, 193")
// val customUsageSearcher = object : CustomUsageSearcher() {
// override fun processElementUsages(element: PsiElement, processor: Processor<Usage>, options: FindUsagesOptions) {
// runReadAction { processor.process(UsageInfo2UsageAdapter(UsageInfo(element))) }
// }
// }
// // ExtensionTestUtil.maskExtensions(CustomUsageSearcher.EP_NAME, listOf(customUsageSearcher), testRootDisposable)
// myFixture.configureByText(KotlinFileType.INSTANCE, """val <caret>selfUsed = 1""")
//
// val usages = myFixture.getUsageViewTreeTextRepresentation(myFixture.elementAtCaret)
// assertTrue(usages.contains("val selfUsed"))
val customUsageSearcher = object : CustomUsageSearcher() {
override fun processElementUsages(element: PsiElement, processor: ProcessorInCompat<Usage>, options: FindUsagesOptions) {
runReadAction { processor.process(UsageInfo2UsageAdapter(UsageInfo(element))) }
}
}
maskExtensions(CustomUsageSearcher.EP_NAME, listOf(customUsageSearcher), testRootDisposable)
myFixture.configureByText(KotlinFileType.INSTANCE, """val <caret>selfUsed = 1""")
val usages = myFixture.getUsageViewTreeTextRepresentation(myFixture.elementAtCaret)
assertTrue(usages.contains("val selfUsed"))
}
}
idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt
+11
View File
@@ -0,0 +1,11 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.findUsages
import com.intellij.util.Processor
// BUNCH 193
typealias ProcessorInCompat<T> = Processor<T>
idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.201
+11
View File
@@ -0,0 +1,11 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.findUsages
import com.intellij.util.Processor
// BUNCH 201
typealias ProcessorInCompat<T> = Processor<in T>
idea/tests/org/jetbrains/kotlin/idea/compat.kt
+11
View File
@@ -6,7 +6,10 @@
package org.jetbrains.kotlin.idea
import com.intellij.ide.hierarchy.HierarchyTreeStructure
import com.intellij.openapi.Disposable
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.util.Computable
import com.intellij.testFramework.ExtensionTestUtil
import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
// BUNCH: 193
@@ -18,3 +21,11 @@ fun doHierarchyTestCompat(
) {
HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure)
}
fun <T> maskExtensions(
pointName: ExtensionPointName<T>,
newExtensions: List<T>,
parentDisposable: Disposable
) {
ExtensionTestUtil.maskExtensions(pointName, newExtensions, parentDisposable)
}
idea/tests/org/jetbrains/kotlin/idea/compat.kt.192
+12 -1
View File
@@ -6,10 +6,13 @@
package org.jetbrains.kotlin.idea
import com.intellij.ide.hierarchy.HierarchyTreeStructure
import com.intellij.openapi.Disposable
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.util.Computable
import com.intellij.testFramework.PlatformTestUtil
import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
// BUNCH: 193
// BUNCH: 192
@Suppress("UNUSED_PARAMETER")
fun doHierarchyTestCompat(
hierarchyFixture: HierarchyViewTestFixture,
@@ -18,3 +21,11 @@ fun doHierarchyTestCompat(
) {
hierarchyFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure)
}
fun <T> maskExtensions(
pointName: ExtensionPointName<T>,
newExtensions: List<T>,
parentDisposable: Disposable
) {
PlatformTestUtil.maskExtensions(pointName, newExtensions, parentDisposable)
}