From 74bfaa4ffe60a5e06a672e8861ee3fad46d8669d Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 25 Jan 2017 18:38:53 +0300
Subject: [PATCH] Quick Fixes: Change API level as well as language level in
 "Enable unsupported feature fix"  #KT-15918 Fixed

---
 .../idea/quickfix/EnableUnsupportedFeatureFix.kt       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/EnableUnsupportedFeatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/EnableUnsupportedFeatureFix.kt
index 26ef5e1800f..1562da14af2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/EnableUnsupportedFeatureFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/EnableUnsupportedFeatureFix.kt
@@ -43,7 +43,10 @@ sealed class EnableUnsupportedFeatureFix(
             val module = ModuleUtilCore.findModuleForPsiElement(file) ?: return
             val facetSettings = KotlinFacet.get(module)?.configuration?.settings ?: return
             ModuleRootModificationUtil.updateModel(module) {
-                facetSettings.versionInfo.languageLevel = targetVersion
+                with(facetSettings.versionInfo) {
+                    languageLevel = targetVersion
+                    apiLevel = targetVersion
+                }
             }
         }
     }
@@ -54,7 +57,10 @@ sealed class EnableUnsupportedFeatureFix(
         override fun getText() = "Set project language level to ${targetVersion.versionString}"
 
         override fun invoke(project: Project, editor: Editor?, file: KtFile) {
-            KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.languageVersion = targetVersion.versionString
+            with(KotlinCommonCompilerArgumentsHolder.getInstance(project).settings) {
+                languageVersion = targetVersion.versionString
+                apiVersion = targetVersion.versionString
+            }
             ProjectRootManagerEx.getInstanceEx(project).makeRootsChange({}, false, true)
         }
     }