From dd2630e5c66cab6359c8143285c661ca709c88db Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 25 Sep 2017 14:02:14 +0300
Subject: [PATCH] Fix loading additional compiler arguments from facets for
 libraries

---
 .../kotlin/idea/compiler/IDELanguageSettingsProvider.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
index bfae1e7df72..d2f66fdc0fd 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
@@ -41,7 +41,7 @@ object IDELanguageSettingsProvider : LanguageSettingsProvider {
         val map = mutableMapOf<AnalysisFlag<*>, Any>()
         for (module in ModuleManager.getInstance(project).modules) {
             val settings = KotlinFacetSettingsProvider.getInstance(project).getSettings(module) ?: continue
-            val compilerArguments = settings.compilerArguments as? K2JVMCompilerArguments ?: continue
+            val compilerArguments = settings.mergedCompilerArguments as? K2JVMCompilerArguments ?: continue
 
             val jsr305state = Jsr305State.findByDescription(compilerArguments.jsr305)
             if (jsr305state != null && jsr305state != Jsr305State.IGNORE) {