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

Switch to 193 platform

Browse Source
This commit is contained in:
Nikolay Krasko
2020-01-19 12:01:53 +03:00
parent 388797618a
commit f01b4706d1
172 changed files with 763 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt
+39 -38
View File
@@ -20,6 +20,7 @@ import com.intellij.testFramework.registerServiceInstance
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.uast.UExpression
import org.jetbrains.uast.evaluateString
import org.jetbrains.uast.toUElementOfType
@@ -32,36 +33,35 @@ class KotlinUastReferencesTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
@Test
fun `test original getter is visible when reference is under renaming`() {
KotlinTestUtils.runTest(this) {
registerReferenceProviders(testRootDisposable) {
registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost ->
arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost))
})
}
registerReferenceProviders(testRootDisposable) {
registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost ->
arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost))
})
}
myFixture.configureByText(
"KotlinBean.kt", """
data class KotlinBean(val myF<caret>ield: String)
myFixture.configureByText(
"KotlinBean.kt", """
data class KotlinBean(val myF<caret>ield: String)
val reference = "myField"
val reference = "myField"
""".trimIndent()
)
""".trimIndent()
)
myFixture.renameElementAtCaret("myRenamedField")
myFixture.renameElementAtCaret("myRenamedField")
myFixture.checkResult(
"""
myFixture.checkResult(
"""
data class KotlinBean(val myRenamedField: String)
val reference = "myRenamedField"
""".trimIndent()
)
""".trimIndent()
)
}
}
}
@@ -99,25 +99,26 @@ fun registerReferenceProviders(disposable: Disposable, registerContributors: Psi
}
fun registerReferenceContributor(contributor: PsiReferenceContributor, disposable: Disposable) {
val referenceContributorEp = Extensions.getArea(null).getExtensionPoint<PsiReferenceContributorEP>(PsiReferenceContributor.EP_NAME.name)
val contributorEp = object : PsiReferenceContributorEP() {
override fun getInstance(): PsiReferenceContributor = contributor
}
referenceContributorEp.registerExtension(contributorEp)
val application = ApplicationManager.getApplication()
//we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors
val oldReferenceProviderRegistry =
application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry
application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl())
Disposer.register(disposable, Disposable {
referenceContributorEp.unregisterExtension(contributorEp)
application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry)
})
error("PsiReferenceContributorEP is final in 193 platform")
// val referenceContributorEp = Extensions.getArea(null).getExtensionPoint<PsiReferenceContributorEP>(PsiReferenceContributor.EP_NAME.name)
//
// val contributorEp = object : PsiReferenceContributorEP() {
// override fun getInstance(): PsiReferenceContributor = contributor
// }
//
// referenceContributorEp.registerExtension(contributorEp)
//
// val application = ApplicationManager.getApplication()
//
// //we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors
// val oldReferenceProviderRegistry =
// application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry
// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl())
//
// Disposer.register(disposable, Disposable {
// referenceContributorEp.unregisterExtension(contributorEp)
// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry)
// })
}
plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.193 → plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.192
+38 -39
View File
@@ -20,7 +20,6 @@ import com.intellij.testFramework.registerServiceInstance
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.uast.UExpression
import org.jetbrains.uast.evaluateString
import org.jetbrains.uast.toUElementOfType
@@ -33,35 +32,36 @@ class KotlinUastReferencesTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
@Test
fun `test original getter is visible when reference is under renaming`() {
KotlinTestUtils.runTest(this) {
registerReferenceProviders(testRootDisposable) {
registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost ->
arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost))
})
}
myFixture.configureByText(
"KotlinBean.kt", """
data class KotlinBean(val myF<caret>ield: String)
registerReferenceProviders(testRootDisposable) {
registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost ->
arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost))
})
}
val reference = "myField"
myFixture.configureByText(
"KotlinBean.kt", """
data class KotlinBean(val myF<caret>ield: String)
""".trimIndent()
)
val reference = "myField"
myFixture.renameElementAtCaret("myRenamedField")
""".trimIndent()
)
myFixture.checkResult(
"""
myFixture.renameElementAtCaret("myRenamedField")
myFixture.checkResult(
"""
data class KotlinBean(val myRenamedField: String)
val reference = "myRenamedField"
""".trimIndent()
)
}
""".trimIndent()
)
}
}
@@ -99,26 +99,25 @@ fun registerReferenceProviders(disposable: Disposable, registerContributors: Psi
}
fun registerReferenceContributor(contributor: PsiReferenceContributor, disposable: Disposable) {
error("PsiReferenceContributorEP is final in 193 platform")
// val referenceContributorEp = Extensions.getArea(null).getExtensionPoint<PsiReferenceContributorEP>(PsiReferenceContributor.EP_NAME.name)
//
// val contributorEp = object : PsiReferenceContributorEP() {
// override fun getInstance(): PsiReferenceContributor = contributor
// }
//
// referenceContributorEp.registerExtension(contributorEp)
//
// val application = ApplicationManager.getApplication()
//
// //we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors
// val oldReferenceProviderRegistry =
// application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry
// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl())
//
// Disposer.register(disposable, Disposable {
// referenceContributorEp.unregisterExtension(contributorEp)
// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry)
// })
val referenceContributorEp = Extensions.getArea(null).getExtensionPoint<PsiReferenceContributorEP>(PsiReferenceContributor.EP_NAME.name)
val contributorEp = object : PsiReferenceContributorEP() {
override fun getInstance(): PsiReferenceContributor = contributor
}
referenceContributorEp.registerExtension(contributorEp)
val application = ApplicationManager.getApplication()
//we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors
val oldReferenceProviderRegistry =
application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry
application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl())
Disposer.register(disposable, Disposable {
referenceContributorEp.unregisterExtension(contributorEp)
application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry)
})
}