From 53f04d0d19eb2a8f7534693b2bd15baa9cb3c2cb Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Thu, 31 May 2018 09:23:13 +0300
Subject: [PATCH] jps: fix mergedCompilerArguments getter
 (mergedCompilerArguments)

Original commit: 40b9fa88b7093cb99bd796722110606fc0206944
---
 .../src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
index 0e3ccdde578..feb6670c87d 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
@@ -81,6 +81,7 @@ private inline fun <reified T : CommonCompilerArguments> JpsModule.getCompilerAr
 
     val facetSettings = kotlinFacet?.settings ?: return projectSettingsCopy
     if (facetSettings.useProjectSettings) return projectSettingsCopy
+    facetSettings.updateMergedArguments()
     return facetSettings.mergedCompilerArguments as? T ?: projectSettingsCopy
 }