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

Use IDELanguageSettingsProvider getting languageVersionSettings and targetPlatform during analysis

Browse Source
This commit is contained in:
Natalia Selezneva
2018-08-02 10:48:13 +03:00
committed by Ilya Chernikov
parent f2395bac2f
commit 0e8b93bf35
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+4 -3
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.project
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleUtilCore
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.ProjectFileIndex 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.arguments.*
import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.config.* 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.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.Kotlin2JvmCompilerArgumentsHolder
import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder
import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings
@@ -244,7 +245,7 @@ val KtElement.languageVersionSettings: LanguageVersionSettings
if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) { if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) {
return LanguageVersionSettingsImpl.DEFAULT return LanguageVersionSettingsImpl.DEFAULT
} }
return ModuleUtilCore.findModuleForPsiElement(this)?.languageVersionSettings ?: LanguageVersionSettingsImpl.DEFAULT return IDELanguageSettingsProvider.getLanguageVersionSettings(this.getModuleInfo(), project)
} }
val KtElement.jvmTarget: JvmTarget val KtElement.jvmTarget: JvmTarget
@@ -252,5 +253,5 @@ val KtElement.jvmTarget: JvmTarget
if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) { if (ServiceManager.getService(project, ProjectFileIndex::class.java) == null) {
return JvmTarget.DEFAULT return JvmTarget.DEFAULT
} }
return ModuleUtilCore.findModuleForPsiElement(this)?.targetPlatform?.version as? JvmTarget ?: JvmTarget.DEFAULT return IDELanguageSettingsProvider.getTargetPlatform(this.getModuleInfo(), project) as? JvmTarget ?: JvmTarget.DEFAULT
} }