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

FIx possible NPEs when try to use TestModuleProperties in IDEA 144.x

Browse Source 
#EA-78931 Fixed
This commit is contained in:
Zalim Bashorov
2016-02-09 15:08:26 +03:00
parent 0f90dc1649
commit eacd50c4dc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt
+3 -2
View File
@@ -60,8 +60,9 @@ private val getRelatedProductionModule: (Module) -> Module? = run {
} }
return@run { module -> return@run { module ->
val instance = getInstanceMethod(null, module) getInstanceMethod(null, module)?.let {
getProductionModuleMethod(instance) as Module? getProductionModuleMethod(it) as Module?
}
} }
} }
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt
+3 -2
View File
@@ -63,8 +63,9 @@ object KotlinBuilderModuleScriptGenerator {
} }
return@run { module -> return@run { module ->
val instance = getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module) getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module)?.let {
getProductionModuleMethod(instance) as JpsModule? getProductionModuleMethod(it) as JpsModule?
}
} }
} }