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

Minor: rename KtFile.targetPlatform -> forcedTargetPlatform

Browse Source 
To avoid confusing with platform extension and debugging for 3 hours
This commit is contained in:
Pavel V. Talanov
2018-06-05 16:55:32 +02:00
parent ced3cf0904
commit 74052542b4
6 changed files with 10 additions and 13 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
View File
@@ -37,6 +37,8 @@ import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgu
import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings
import org.jetbrains.kotlin.idea.facet.getLibraryLanguageLevel
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.UserDataProperty
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.utils.Jsr305State
@@ -46,6 +48,8 @@ val KtElement.platform: TargetPlatform
val KtElement.builtIns: KotlinBuiltIns
get() = getResolutionFacade().moduleDescriptor.builtIns
var KtFile.forcedTargetPlatform: TargetPlatform? by UserDataProperty(Key.create("FORCED_TARGET_PLATFORM"))
fun Module.getAndCacheLanguageLevelByDependencies(): LanguageVersion {
val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getInitializedSettings(this)
val languageLevel = getLibraryLanguageLevel(this, null, facetSettings.targetPlatformKind)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
+1 -2
View File
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.psi.KtCodeFragment;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.psi.KtPsiFactoryKt;
import org.jetbrains.kotlin.resolve.TargetPlatform;
import org.jetbrains.kotlin.resolve.TargetPlatformKt;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
public class TargetPlatformDetector {
@@ -39,7 +38,7 @@ public class TargetPlatformDetector {
@NotNull
public static TargetPlatform getPlatform(@NotNull KtFile file) {
TargetPlatform explicitPlatform = TargetPlatformKt.getTargetPlatform(file);
TargetPlatform explicitPlatform = PlatformKt.getForcedTargetPlatform(file);
if (explicitPlatform != null) return explicitPlatform;
if (file instanceof KtCodeFragment) {