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

Minor: remove warnings caused by ExtensionPointName.create nullability

Browse Source
This commit is contained in:
Nikolay Krasko
2017-04-11 20:44:06 +03:00
parent baa75fc8d5
commit 9f037c3c62
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt
+3 -3
View File
@@ -22,11 +22,11 @@ import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
open class ProjectExtensionDescriptor<T>(name: String, private val extensionClass: Class<T>) { open class ProjectExtensionDescriptor<T>(name: String, private val extensionClass: Class<T>) {
val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)!! val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)
fun registerExtensionPoint(project: Project) { fun registerExtensionPoint(project: Project) {
Extensions.getArea(project).registerExtensionPoint( Extensions.getArea(project).registerExtensionPoint(
extensionPointName.name!!, extensionPointName.name,
extensionClass.name, extensionClass.name,
ExtensionPoint.Kind.INTERFACE ExtensionPoint.Kind.INTERFACE
) )
@@ -38,7 +38,7 @@ open class ProjectExtensionDescriptor<T>(name: String, private val extensionClas
fun getInstances(project: Project): List<T> { fun getInstances(project: Project): List<T> {
val projectArea = Extensions.getArea(project) val projectArea = Extensions.getArea(project)
if (!projectArea.hasExtensionPoint(extensionPointName.name!!)) return listOf() if (!projectArea.hasExtensionPoint(extensionPointName.name)) return listOf()
return projectArea.getExtensionPoint(extensionPointName).extensions.toList() return projectArea.getExtensionPoint(extensionPointName).extensions.toList()
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.config.TargetPlatformKind
interface KotlinVersionInfoProvider { interface KotlinVersionInfoProvider {
companion object { companion object {
val EP_NAME: ExtensionPointName<KotlinVersionInfoProvider> = ExtensionPointName.create("org.jetbrains.kotlin.versionInfoProvider")!! val EP_NAME: ExtensionPointName<KotlinVersionInfoProvider> = ExtensionPointName.create("org.jetbrains.kotlin.versionInfoProvider")
} }
fun getCompilerVersion(module: Module): String? fun getCompilerVersion(module: Module): String?
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfigurationExtension.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.extensions.ExtensionPointName
interface KotlinFacetConfigurationExtension { interface KotlinFacetConfigurationExtension {
companion object { companion object {
val EP_NAME: ExtensionPointName<KotlinFacetConfigurationExtension> = ExtensionPointName.create("org.jetbrains.kotlin.facetConfigurationExtension")!! val EP_NAME: ExtensionPointName<KotlinFacetConfigurationExtension> = ExtensionPointName.create("org.jetbrains.kotlin.facetConfigurationExtension")
} }
fun createEditorTabs(editorContext: FacetEditorContext, validatorsManager: FacetValidatorsManager): List<FacetEditorTab> fun createEditorTabs(editorContext: FacetEditorContext, validatorsManager: FacetValidatorsManager): List<FacetEditorTab>
idea/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinPlatformGradleDetector.kt
+1 -1
View File
@@ -39,7 +39,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
interface KotlinPlatformGradleDetector { interface KotlinPlatformGradleDetector {
companion object { companion object {
val EP_NAME: ExtensionPointName<KotlinPlatformGradleDetector> = ExtensionPointName.create("org.jetbrains.kotlin.platformGradleDetector")!! val EP_NAME: ExtensionPointName<KotlinPlatformGradleDetector> = ExtensionPointName.create("org.jetbrains.kotlin.platformGradleDetector")
} }
fun getResolvedKotlinStdlibVersionByModuleData(moduleData: DataNode<*>, libraryIds: List<String>): String? fun getResolvedKotlinStdlibVersionByModuleData(moduleData: DataNode<*>, libraryIds: List<String>): String?
idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.find.findUsages.FindUsagesHandler
interface KotlinFindUsagesHandlerDecorator { interface KotlinFindUsagesHandlerDecorator {
companion object { companion object {
val EP_NAME: ExtensionPointName<KotlinFindUsagesHandlerDecorator> = ExtensionPointName.create("org.jetbrains.kotlin.findUsagesHandlerDecorator")!! val EP_NAME: ExtensionPointName<KotlinFindUsagesHandlerDecorator> = ExtensionPointName.create("org.jetbrains.kotlin.findUsagesHandlerDecorator")
} }
fun decorateHandler(element: PsiElement, forHighlightUsages: Boolean, delegate: FindUsagesHandler): FindUsagesHandler fun decorateHandler(element: PsiElement, forHighlightUsages: Boolean, delegate: FindUsagesHandler): FindUsagesHandler