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/frontend/src/org/jetbrains/kotlin/extensions/ApplicationExtensionDescriptor.kt
+4 -3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.extensions
import com.intellij.openapi.Disposable
import com.intellij.openapi.extensions.ExtensionPoint
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.extensions.Extensions
@@ -20,8 +21,8 @@ open class ApplicationExtensionDescriptor<T : Any>(name: String, private val ext
)
}
fun registerExtension(extension: T) {
Extensions.getRootArea().getExtensionPoint(extensionPointName).registerExtension(extension)
fun registerExtension(extension: T, disposable: Disposable) {
Extensions.getRootArea().getExtensionPoint(extensionPointName).registerExtension(extension, disposable)
}
fun getInstances(): List<T> {
@@ -30,4 +31,4 @@ open class ApplicationExtensionDescriptor<T : Any>(name: String, private val ext
return projectArea.getExtensionPoint(extensionPointName).extensions.toList()
}
}
}
compiler/frontend/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt
+4 -5
View File
@@ -18,14 +18,13 @@ package org.jetbrains.kotlin.extensions
import com.intellij.openapi.extensions.ExtensionPoint
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
open class ProjectExtensionDescriptor<T : Any>(name: String, private val extensionClass: Class<T>) {
val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)
fun registerExtensionPoint(project: Project) {
Extensions.getArea(project).registerExtensionPoint(
project.extensionArea.registerExtensionPoint(
extensionPointName.name,
extensionClass.name,
ExtensionPoint.Kind.INTERFACE
@@ -33,13 +32,13 @@ open class ProjectExtensionDescriptor<T : Any>(name: String, private val extensi
}
fun registerExtension(project: Project, extension: T) {
Extensions.getArea(project).getExtensionPoint(extensionPointName).registerExtension(extension)
project.extensionArea.getExtensionPoint(extensionPointName).registerExtension(extension, project)
}
fun getInstances(project: Project): List<T> {
val projectArea = Extensions.getArea(project)
val projectArea = project.extensionArea
if (!projectArea.hasExtensionPoint(extensionPointName.name)) return listOf()
return projectArea.getExtensionPoint(extensionPointName).extensions.toList()
}
}
}
compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
+1 -1
View File
@@ -40,7 +40,7 @@ protected constructor(
private fun update(): R {
val newVal = ApplicationManager.getApplication().let { app ->
Pair(app, map(app.getExtensions(epName).toList()))
Pair(app, map(app.extensionArea.getExtensionPoint(epName).extensionList))
}
cached = WeakReference(newVal)
return newVal.second