Extract skipPreReleaseCheck out of DeserializationConfiguration.skipMetadataVersionCheck
This commit is contained in:
+4
-2
@@ -22,10 +22,12 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
|
|||||||
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
|
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
|
||||||
|
|
||||||
class CompilerDeserializationConfiguration(languageVersionSettings: LanguageVersionSettings) : DeserializationConfiguration {
|
class CompilerDeserializationConfiguration(languageVersionSettings: LanguageVersionSettings) : DeserializationConfiguration {
|
||||||
override val typeAliasesAllowed = languageVersionSettings.supportsFeature(LanguageFeature.TypeAliases)
|
|
||||||
|
|
||||||
override val skipMetadataVersionCheck = languageVersionSettings.getFlag(AnalysisFlag.skipMetadataVersionCheck)
|
override val skipMetadataVersionCheck = languageVersionSettings.getFlag(AnalysisFlag.skipMetadataVersionCheck)
|
||||||
|
|
||||||
|
override val skipPreReleaseCheck = skipMetadataVersionCheck
|
||||||
|
|
||||||
|
override val typeAliasesAllowed = languageVersionSettings.supportsFeature(LanguageFeature.TypeAliases)
|
||||||
|
|
||||||
override val isJvmPackageNameSupported = languageVersionSettings.supportsFeature(LanguageFeature.JvmPackageName)
|
override val isJvmPackageNameSupported = languageVersionSettings.supportsFeature(LanguageFeature.JvmPackageName)
|
||||||
|
|
||||||
override val returnsEffectAllowed: Boolean = languageVersionSettings.supportsFeature(LanguageFeature.ReturnsEffect)
|
override val returnsEffectAllowed: Boolean = languageVersionSettings.supportsFeature(LanguageFeature.ReturnsEffect)
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ class DeserializedDescriptorResolver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private val KotlinJvmBinaryClass.isPreReleaseInvisible: Boolean
|
private val KotlinJvmBinaryClass.isPreReleaseInvisible: Boolean
|
||||||
get() = !skipMetadataVersionCheck &&
|
get() = !components.configuration.skipPreReleaseCheck &&
|
||||||
!KotlinCompilerVersion.isPreRelease() &&
|
!KotlinCompilerVersion.isPreRelease() &&
|
||||||
(classHeader.isPreRelease || classHeader.metadataVersion == KOTLIN_1_1_EAP_METADATA_VERSION)
|
(classHeader.isPreRelease || classHeader.metadataVersion == KOTLIN_1_1_EAP_METADATA_VERSION)
|
||||||
|
|
||||||
|
|||||||
+3
@@ -20,6 +20,9 @@ interface DeserializationConfiguration {
|
|||||||
val skipMetadataVersionCheck: Boolean
|
val skipMetadataVersionCheck: Boolean
|
||||||
get() = false
|
get() = false
|
||||||
|
|
||||||
|
val skipPreReleaseCheck: Boolean
|
||||||
|
get() = false
|
||||||
|
|
||||||
val typeAliasesAllowed: Boolean
|
val typeAliasesAllowed: Boolean
|
||||||
get() = true
|
get() = true
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -80,7 +80,7 @@ class KotlinJavascriptPackageFragment(
|
|||||||
get() = null
|
get() = null
|
||||||
|
|
||||||
override val isPreReleaseInvisible: Boolean =
|
override val isPreReleaseInvisible: Boolean =
|
||||||
!configuration.skipMetadataVersionCheck && (header.flags and 1) != 0 && !KotlinCompilerVersion.isPreRelease()
|
!configuration.skipPreReleaseCheck && (header.flags and 1) != 0 && !KotlinCompilerVersion.isPreRelease()
|
||||||
|
|
||||||
override val presentableString: String
|
override val presentableString: String
|
||||||
get() = "Package '$fqName'"
|
get() = "Package '$fqName'"
|
||||||
|
|||||||
Reference in New Issue
Block a user