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

Don't replace explicitly configured project settings with autodetected ones

Browse Source 
(cherry picked from commit f16f975)
This commit is contained in:
Dmitry Jemerov
2017-02-17 14:04:57 +01:00
parent 7bae72113b
commit 83d64e8eba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+6 -2
View File
@@ -54,8 +54,12 @@ fun Module.getAndCacheLanguageLevelByDependencies(): LanguageVersion {
val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getSettings(this) val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getSettings(this)
if (facetSettings.useProjectSettings) { if (facetSettings.useProjectSettings) {
with(KotlinCommonCompilerArgumentsHolder.getInstance(project).settings) { with(KotlinCommonCompilerArgumentsHolder.getInstance(project).settings) {
languageVersion = languageLevel.versionString if (languageVersion == null) {
apiVersion = languageLevel.versionString languageVersion = languageLevel.versionString
}
if (apiVersion == null) {
apiVersion = languageLevel.versionString
}
} }
} }
else { else {