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/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
+1 -4
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.codegen
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElementFinder
import com.intellij.psi.search.GlobalSearchScope
@@ -109,9 +108,7 @@ object GenerationUtils {
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
trace: BindingTrace
): GenerationState {
Extensions.getArea(project)
.getExtensionPoint(PsiElementFinder.EP_NAME)
.unregisterExtension(JavaElementFinder::class.java)
PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java)
val scope = GlobalSearchScope.filesScope(project, files.map { it.virtualFile })
.uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project))
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+1 -4
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiElementFinder
@@ -58,9 +57,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
get() = false
override fun setupEnvironment(environment: KotlinCoreEnvironment) {
Extensions.getArea(environment.project)
.getExtensionPoint(PsiElementFinder.EP_NAME)
.unregisterExtension(JavaElementFinder::class.java)
PsiElementFinder.EP.getPoint(environment.project).unregisterExtension(JavaElementFinder::class.java)
}
open fun analyzeAndCheckUnhandled(testDataFile: File, files: List<TestFile>, useLightTree: Boolean = false) {