From 0e8b93bf35dea2f0656b24d8da01752af29707d1 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 2 Aug 2018 10:48:13 +0300 Subject: [PATCH] Use IDELanguageSettingsProvider getting languageVersionSettings and targetPlatform during analysis --- .../src/org/jetbrains/kotlin/idea/project/Platform.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 cb0e61495a8..e5675e5e82d 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 @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.project import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ProjectFileIndex @@ -32,7 +31,9 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.config.* +import org.jetbrains.kotlin.idea.caches.project.getModuleInfo import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.compiler.IDELanguageSettingsProvider import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings @@ -244,7 +245,7 @@ val KtElement.languageVersionSettings: LanguageVersionSettings if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) { return LanguageVersionSettingsImpl.DEFAULT } - return ModuleUtilCore.findModuleForPsiElement(this)?.languageVersionSettings ?: LanguageVersionSettingsImpl.DEFAULT + return IDELanguageSettingsProvider.getLanguageVersionSettings(this.getModuleInfo(), project) } val KtElement.jvmTarget: JvmTarget @@ -252,5 +253,5 @@ val KtElement.jvmTarget: JvmTarget if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) { return JvmTarget.DEFAULT } - return ModuleUtilCore.findModuleForPsiElement(this)?.targetPlatform?.version as? JvmTarget ?: JvmTarget.DEFAULT + return IDELanguageSettingsProvider.getTargetPlatform(this.getModuleInfo(), project) as? JvmTarget ?: JvmTarget.DEFAULT }