From bf23cca78cf03622f5d702befae34f5405ec8072 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 27 Sep 2019 19:29:57 +0900 Subject: [PATCH] Make KotlinFacetSettingsProvider.getInstance() nullable A module may not have a KotlinFacet. It isn't correct to throw an exception in that case. Original commit: 44b7a5cc36a00f1cd24151cd4926134931c47c47 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 328c4430c44..59f9465319d 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -290,6 +290,8 @@ interface KotlinFacetSettingsProvider { fun getInitializedSettings(module: Module): KotlinFacetSettings companion object { - fun getInstance(project: Project) = ServiceManager.getService(project, KotlinFacetSettingsProvider::class.java)!! + fun getInstance(project: Project): KotlinFacetSettingsProvider? { + return ServiceManager.getService(project, KotlinFacetSettingsProvider::class.java) + } } }