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

Fix deprecation warnings related to Project extensions

Browse Source
This commit is contained in:
Alexander Udalov
2020-08-13 19:47:58 +02:00
parent 196893bc4d
commit 7fb7dc0210
15 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
+1 -5
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElementFinder
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
@@ -20,9 +19,6 @@ abstract class AbstractFirResolveWithSessionTestCase : KotlinTestWithEnvironment
}
protected fun prepareProjectExtensions(project: Project) {
Extensions.getArea(project)
.getExtensionPoint(PsiElementFinder.EP_NAME)
.unregisterExtension(JavaElementFinder::class.java)
PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java)
}
}
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt
+1 -3
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.java
import com.intellij.openapi.extensions.Extensions
import com.intellij.psi.PsiElementFinder
import com.intellij.psi.impl.compiled.ClsClassImpl
import com.intellij.psi.search.GlobalSearchScope
@@ -20,8 +19,7 @@ abstract class AbstractFirOldFrontendLightClassesTest : AbstractFirOldFrontendDi
override fun checkResultingFirFiles(firFiles: List<FirFile>, testDataFile: File) {
super.checkResultingFirFiles(firFiles, testDataFile)
val ourFinders =
Extensions.getArea(project).getExtensionPoint(PsiElementFinder.EP_NAME).extensions.filterIsInstance<FirJavaElementFinder>()
val ourFinders = PsiElementFinder.EP.getPoint(project).extensions.filterIsInstance<FirJavaElementFinder>()
assertNotEmpty(ourFinders)
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
+1 -4
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.fir.java
import com.intellij.lang.java.JavaLanguage
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtilRt
@@ -82,9 +81,7 @@ abstract class AbstractFirTypeEnhancementTest : KtUsefulTestCase() {
),
EnvironmentConfigFiles.JVM_CONFIG_FILES
).apply {
Extensions.getArea(project)
.getExtensionPoint(PsiElementFinder.EP_NAME)
.unregisterExtension(JavaElementFinder::class.java)
PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java)
}
}
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/AbstractFir2IrTextTest.kt
+1 -4
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElementFinder
import com.intellij.psi.search.GlobalSearchScope
@@ -20,9 +19,7 @@ import java.io.File
abstract class AbstractFir2IrTextTest : AbstractIrTextTestCase() {
private fun prepareProjectExtensions(project: Project) {
Extensions.getArea(project)
.getExtensionPoint(PsiElementFinder.EP_NAME)
.unregisterExtension(JavaElementFinder::class.java)
PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java)
}
override fun doTest(wholeFile: File, testFiles: List<TestFile>) {
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+1 -5
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.util.Disposer
import com.intellij.psi.PsiElementFinder
import com.intellij.psi.search.GlobalSearchScope
@@ -167,13 +166,10 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
override fun processModule(moduleData: ModuleData): ProcessorAction {
val disposable = Disposer.newDisposable()
val configuration = createDefaultConfiguration(moduleData)
val environment = KotlinCoreEnvironment.createForTests(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
Extensions.getArea(environment.project)
.getExtensionPoint(PsiElementFinder.EP_NAME)
PsiElementFinder.EP.getPoint(environment.project)
.unregisterExtension(JavaElementFinder::class.java)
runAnalysis(moduleData, environment)