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

jps: fix mergedCompilerArguments getter (mergedCompilerArguments)

Browse Source 
Original commit: 40b9fa88b7
This commit is contained in:
Sergey Rostov
2018-05-31 09:23:13 +03:00
parent a1fa9ffdbb
commit 53f04d0d19
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
+1
View File
@@ -81,6 +81,7 @@ private inline fun <reified T : CommonCompilerArguments> JpsModule.getCompilerAr
val facetSettings = kotlinFacet?.settings ?: return projectSettingsCopy val facetSettings = kotlinFacet?.settings ?: return projectSettingsCopy
if (facetSettings.useProjectSettings) return projectSettingsCopy if (facetSettings.useProjectSettings) return projectSettingsCopy
facetSettings.updateMergedArguments()
return facetSettings.mergedCompilerArguments as? T ?: projectSettingsCopy return facetSettings.mergedCompilerArguments as? T ?: projectSettingsCopy
} }