From b9b4cce2937f8a123e19f0a3095561259590f149 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 27 Feb 2017 22:40:35 +0300 Subject: [PATCH] Set JVM target from facet settings on compiler configuration creation Otherwise analyse in IDE is perfomed under default JVM target and wrong diagnostics are reported. #KT-16329 In Progress --- .../src/org/jetbrains/kotlin/idea/project/Platform.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt index 6bf40534d4b..c9782c7d347 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt @@ -145,6 +145,13 @@ private fun getExtraLanguageFeatures( fun KtElement.createCompilerConfiguration(): CompilerConfiguration = CompilerConfiguration().apply { languageVersionSettings = this@createCompilerConfiguration.languageVersionSettings + + val module = ModuleUtilCore.findModuleForPsiElement(this@createCompilerConfiguration) + val platform = module?.targetPlatform?.version + if (platform is JvmTarget) { + put(JVMConfigurationKeys.JVM_TARGET, platform) + } + isReadOnly = true }