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

[Gradle] kgp-idea.serialize: Change naming schema from Idea* to IdeaKotlin*

Browse Source 
KT-54825
This commit is contained in:
Sebastian Sellmair
2022-11-10 14:59:20 +01:00
committed by Space Team
parent 224a237385
commit 786adcaf3f
44 changed files with 281 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/extras.kt
+5 -5
View File
@@ -10,17 +10,17 @@ package org.jetbrains.kotlin.gradle.idea.proto
import com.google.protobuf.ByteString import com.google.protobuf.ByteString
import org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.ideaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.generated.ideaExtrasProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.tooling.core.* import org.jetbrains.kotlin.tooling.core.*
@Suppress("unchecked_cast") @Suppress("unchecked_cast")
internal fun IdeaSerializationContext.IdeaExtrasProto(extras: Extras): IdeaExtrasProto { internal fun IdeaKotlinSerializationContext.IdeaExtrasProto(extras: Extras): IdeaExtrasProto {
val context = this val context = this
return ideaExtrasProto { return ideaExtrasProto {
extras.entries.forEach { (key, value) -> extras.entries.forEach { (key, value) ->
val serializer = context.extrasSerializationExtension.serializer(key) ?: return@forEach val serializer = context.extrasSerializationExtension.serializer(key) ?: return@forEach
serializer as IdeaExtrasSerializer<Any> serializer as IdeaKotlinExtrasSerializer<Any>
val serialized = runCatching { serializer.serialize(context, value) ?: return@forEach }.getOrElse { exception -> val serialized = runCatching { serializer.serialize(context, value) ?: return@forEach }.getOrElse { exception ->
logger.error("Failed to serialize $key, using ${serializer.javaClass.simpleName}", exception) logger.error("Failed to serialize $key, using ${serializer.javaClass.simpleName}", exception)
return@forEach return@forEach
@@ -32,7 +32,7 @@ internal fun IdeaSerializationContext.IdeaExtrasProto(extras: Extras): IdeaExtra
} }
@Suppress("unchecked_cast") @Suppress("unchecked_cast")
internal fun IdeaSerializationContext.Extras(proto: IdeaExtrasProto): MutableExtras { internal fun IdeaKotlinSerializationContext.Extras(proto: IdeaExtrasProto): MutableExtras {
return proto.valuesMap.entries.mapNotNull { (keyString, value) -> return proto.valuesMap.entries.mapNotNull { (keyString, value) ->
val key = Extras.Key.fromString(keyString) as Extras.Key<Any> val key = Extras.Key.fromString(keyString) as Extras.Key<Any>
val serializer = extrasSerializationExtension.serializer(key) ?: return@mapNotNull null val serializer = extrasSerializationExtension.serializer(key) ?: return@mapNotNull null
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/container.kt
+9 -9
View File
@@ -13,25 +13,25 @@ import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmContainerProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmContainerProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmSchemaInfoProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmSchemaInfoProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmContainerProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmContainerProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import java.io.InputStream import java.io.InputStream
import java.io.OutputStream import java.io.OutputStream
import java.nio.ByteBuffer import java.nio.ByteBuffer
fun IdeaSerializationContext.IdeaKpmProject(data: ByteArray): IdeaKpmProject? { fun IdeaKotlinSerializationContext.IdeaKpmProject(data: ByteArray): IdeaKpmProject? {
return IdeaKpmProject(data) { IdeaKpmContainerProto.parseFrom(data) } return IdeaKpmProject(data) { IdeaKpmContainerProto.parseFrom(data) }
} }
fun IdeaSerializationContext.IdeaKpmProject(data: ByteBuffer): IdeaKpmProject? { fun IdeaKotlinSerializationContext.IdeaKpmProject(data: ByteBuffer): IdeaKpmProject? {
return IdeaKpmProject(data) { IdeaKpmContainerProto.parseFrom(data) } return IdeaKpmProject(data) { IdeaKpmContainerProto.parseFrom(data) }
} }
fun IdeaSerializationContext.IdeaKpmProject(stream: InputStream): IdeaKpmProject? { fun IdeaKotlinSerializationContext.IdeaKpmProject(stream: InputStream): IdeaKpmProject? {
return IdeaKpmProject(stream) { IdeaKpmContainerProto.parseFrom(stream) } return IdeaKpmProject(stream) { IdeaKpmContainerProto.parseFrom(stream) }
} }
internal fun <T> IdeaSerializationContext.IdeaKpmProject(data: T, proto: (T) -> IdeaKpmContainerProto): IdeaKpmProject? { internal fun <T> IdeaKotlinSerializationContext.IdeaKpmProject(data: T, proto: (T) -> IdeaKpmContainerProto): IdeaKpmProject? {
val container = try { val container = try {
proto(data) proto(data)
} catch (e: InvalidProtocolBufferException) { } catch (e: InvalidProtocolBufferException) {
@@ -42,15 +42,15 @@ internal fun <T> IdeaSerializationContext.IdeaKpmProject(data: T, proto: (T) ->
return IdeaKpmProject(container) return IdeaKpmProject(container)
} }
fun IdeaKpmProject.toByteArray(context: IdeaSerializationContext): ByteArray { fun IdeaKpmProject.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmContainerProto(this).toByteArray() return context.IdeaKpmContainerProto(this).toByteArray()
} }
fun IdeaKpmProject.writeTo(output: OutputStream, context: IdeaSerializationContext) { fun IdeaKpmProject.writeTo(output: OutputStream, context: IdeaKotlinSerializationContext) {
context.IdeaKpmContainerProto(this).writeDelimitedTo(output) context.IdeaKpmContainerProto(this).writeDelimitedTo(output)
} }
internal fun IdeaSerializationContext.IdeaKpmContainerProto(project: IdeaKpmProject): IdeaKpmContainerProto { internal fun IdeaKotlinSerializationContext.IdeaKpmContainerProto(project: IdeaKpmProject): IdeaKpmContainerProto {
return ideaKpmContainerProto { return ideaKpmContainerProto {
schemaVersionMajor = IdeaKpmProtoSchema.versionMajor schemaVersionMajor = IdeaKpmProtoSchema.versionMajor
schemaVersionMinor = IdeaKpmProtoSchema.versionMinor schemaVersionMinor = IdeaKpmProtoSchema.versionMinor
@@ -60,7 +60,7 @@ internal fun IdeaSerializationContext.IdeaKpmContainerProto(project: IdeaKpmProj
} }
} }
internal fun IdeaSerializationContext.IdeaKpmProject(proto: IdeaKpmContainerProto): IdeaKpmProject? { internal fun IdeaKotlinSerializationContext.IdeaKpmProject(proto: IdeaKpmContainerProto): IdeaKpmProject? {
if (!proto.hasSchemaVersionMajor()) { if (!proto.hasSchemaVersionMajor()) {
logger.error("Missing 'schema_version_major'", Throwable()) logger.error("Missing 'schema_version_major'", Throwable())
return null return null
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/contentRoot.kt
+5 -5
View File
@@ -11,10 +11,10 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmContentRootProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmContentRootProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmContentRootProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmContentRootProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import java.io.File import java.io.File
internal fun IdeaSerializationContext.IdeaKpmContentRootProto(sourceDirectory: IdeaKpmContentRoot): IdeaKpmContentRootProto { internal fun IdeaKotlinSerializationContext.IdeaKpmContentRootProto(sourceDirectory: IdeaKpmContentRoot): IdeaKpmContentRootProto {
return ideaKpmContentRootProto { return ideaKpmContentRootProto {
absolutePath = sourceDirectory.file.absolutePath absolutePath = sourceDirectory.file.absolutePath
type = sourceDirectory.type type = sourceDirectory.type
@@ -22,7 +22,7 @@ internal fun IdeaSerializationContext.IdeaKpmContentRootProto(sourceDirectory: I
} }
} }
internal fun IdeaSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmContentRootProto): IdeaKpmContentRoot { internal fun IdeaKotlinSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmContentRootProto): IdeaKpmContentRoot {
return IdeaKpmContentRootImpl( return IdeaKpmContentRootImpl(
file = File(proto.absolutePath), file = File(proto.absolutePath),
type = proto.type, type = proto.type,
@@ -30,10 +30,10 @@ internal fun IdeaSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmContentRo
) )
} }
internal fun IdeaSerializationContext.IdeaKpmContentRoot(data: ByteArray): IdeaKpmContentRoot { internal fun IdeaKotlinSerializationContext.IdeaKpmContentRoot(data: ByteArray): IdeaKpmContentRoot {
return IdeaKpmContentRoot(IdeaKpmContentRootProto.parseFrom(data)) return IdeaKpmContentRoot(IdeaKpmContentRootProto.parseFrom(data))
} }
internal fun IdeaKpmContentRoot.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmContentRoot.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmContentRootProto(this).toByteArray() return context.IdeaKpmContentRootProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/dependency.kt
+3 -3
View File
@@ -14,9 +14,9 @@ import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmUnresolvedBinaryDependency
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmDependencyProto.DependencyCase import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmDependencyProto.DependencyCase
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmDependencyProto(dependency: IdeaKpmDependency): IdeaKpmDependencyProto { internal fun IdeaKotlinSerializationContext.IdeaKpmDependencyProto(dependency: IdeaKpmDependency): IdeaKpmDependencyProto {
return ideaKpmDependencyProto { return ideaKpmDependencyProto {
when (dependency) { when (dependency) {
is IdeaKpmResolvedBinaryDependency -> resolvedBinaryDependency = IdeaKpmResolvedBinaryDependencyProto(dependency) is IdeaKpmResolvedBinaryDependency -> resolvedBinaryDependency = IdeaKpmResolvedBinaryDependencyProto(dependency)
@@ -26,7 +26,7 @@ internal fun IdeaSerializationContext.IdeaKpmDependencyProto(dependency: IdeaKpm
} }
} }
internal fun IdeaSerializationContext.IdeaKpmDependency(proto: IdeaKpmDependencyProto): IdeaKpmDependency? { internal fun IdeaKotlinSerializationContext.IdeaKpmDependency(proto: IdeaKpmDependencyProto): IdeaKpmDependency? {
return when (proto.dependencyCase) { return when (proto.dependencyCase) {
DependencyCase.UNRESOLVED_BINARY_DEPENDENCY -> IdeaKpmUnresolvedBinaryDependency(proto.unresolvedBinaryDependency) DependencyCase.UNRESOLVED_BINARY_DEPENDENCY -> IdeaKpmUnresolvedBinaryDependency(proto.unresolvedBinaryDependency)
DependencyCase.RESOLVED_BINARY_DEPENDENCY -> IdeaKpmResolvedBinaryDependency(proto.resolvedBinaryDependency) DependencyCase.RESOLVED_BINARY_DEPENDENCY -> IdeaKpmResolvedBinaryDependency(proto.resolvedBinaryDependency)
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/fragment.kt
+5 -5
View File
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmFragmentProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmFragmentProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmFragmentProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmFragmentProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmFragment): IdeaKpmFragmentProto { internal fun IdeaKotlinSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmFragment): IdeaKpmFragmentProto {
return ideaKpmFragmentProto { return ideaKpmFragmentProto {
coordinates = IdeaKpmFragmentCoordinatesProto(fragment.coordinates) coordinates = IdeaKpmFragmentCoordinatesProto(fragment.coordinates)
platforms.addAll(fragment.platforms.map { IdeaKpmPlatformProto(it) }) platforms.addAll(fragment.platforms.map { IdeaKpmPlatformProto(it) })
@@ -24,7 +24,7 @@ internal fun IdeaSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmFrag
} }
} }
internal fun IdeaSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentProto): IdeaKpmFragment { internal fun IdeaKotlinSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentProto): IdeaKpmFragment {
return IdeaKpmFragmentImpl( return IdeaKpmFragmentImpl(
coordinates = IdeaKpmFragmentCoordinates(proto.coordinates), coordinates = IdeaKpmFragmentCoordinates(proto.coordinates),
platforms = proto.platformsList.map { IdeaKpmPlatform(it) }.toSet(), platforms = proto.platformsList.map { IdeaKpmPlatform(it) }.toSet(),
@@ -35,10 +35,10 @@ internal fun IdeaSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentProt
) )
} }
internal fun IdeaSerializationContext.IdeaKpmFragment(data: ByteArray): IdeaKpmFragment { internal fun IdeaKotlinSerializationContext.IdeaKpmFragment(data: ByteArray): IdeaKpmFragment {
return IdeaKpmFragment(IdeaKpmFragmentProto.parseFrom(data)) return IdeaKpmFragment(IdeaKpmFragmentProto.parseFrom(data))
} }
internal fun IdeaKpmFragment.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmFragment.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmFragmentProto(this).toByteArray() return context.IdeaKpmFragmentProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/fragmentDependency.kt
+5 -5
View File
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmFragmentDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmFragmentDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmFragmentDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmFragmentDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmFragmentDependencyProto(dependency: IdeaKpmFragmentDependency): IdeaKpmFragmentDependencyProto { internal fun IdeaKotlinSerializationContext.IdeaKpmFragmentDependencyProto(dependency: IdeaKpmFragmentDependency): IdeaKpmFragmentDependencyProto {
return ideaKpmFragmentDependencyProto { return ideaKpmFragmentDependencyProto {
type = when (dependency.type) { type = when (dependency.type) {
IdeaKpmFragmentDependency.Type.Regular -> IdeaKpmFragmentDependencyProto.Type.REGULAR IdeaKpmFragmentDependency.Type.Regular -> IdeaKpmFragmentDependencyProto.Type.REGULAR
@@ -26,7 +26,7 @@ internal fun IdeaSerializationContext.IdeaKpmFragmentDependencyProto(dependency:
} }
} }
internal fun IdeaSerializationContext.IdeaKpmFragmentDependency(proto: IdeaKpmFragmentDependencyProto): IdeaKpmFragmentDependency { internal fun IdeaKotlinSerializationContext.IdeaKpmFragmentDependency(proto: IdeaKpmFragmentDependencyProto): IdeaKpmFragmentDependency {
return IdeaKpmFragmentDependencyImpl( return IdeaKpmFragmentDependencyImpl(
type = when (proto.type) { type = when (proto.type) {
IdeaKpmFragmentDependencyProto.Type.REGULAR -> IdeaKpmFragmentDependency.Type.Regular IdeaKpmFragmentDependencyProto.Type.REGULAR -> IdeaKpmFragmentDependency.Type.Regular
@@ -39,10 +39,10 @@ internal fun IdeaSerializationContext.IdeaKpmFragmentDependency(proto: IdeaKpmFr
) )
} }
internal fun IdeaSerializationContext.IdeaKpmFragmentDependency(data: ByteArray): IdeaKpmFragmentDependency { internal fun IdeaKotlinSerializationContext.IdeaKpmFragmentDependency(data: ByteArray): IdeaKpmFragmentDependency {
return IdeaKpmFragmentDependency(IdeaKpmFragmentDependencyProto.parseFrom(data)) return IdeaKpmFragmentDependency(IdeaKpmFragmentDependencyProto.parseFrom(data))
} }
internal fun IdeaKpmFragmentDependency.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmFragmentDependency.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmFragmentDependencyProto(this).toByteArray() return context.IdeaKpmFragmentDependencyProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/module.kt
+5 -5
View File
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleImpl
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariant import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariant
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmModuleProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmModuleProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmModuleProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmModuleProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmModuleProto(module: IdeaKpmModule): IdeaKpmModuleProto { internal fun IdeaKotlinSerializationContext.IdeaKpmModuleProto(module: IdeaKpmModule): IdeaKpmModuleProto {
return ideaKpmModuleProto { return ideaKpmModuleProto {
coordinates = IdeaKpmModuleCoordinatesProto(module.coordinates) coordinates = IdeaKpmModuleCoordinatesProto(module.coordinates)
fragments.addAll(module.fragments.filter { it !is IdeaKpmVariant }.map { IdeaKpmFragmentProto(it) }) fragments.addAll(module.fragments.filter { it !is IdeaKpmVariant }.map { IdeaKpmFragmentProto(it) })
@@ -20,17 +20,17 @@ internal fun IdeaSerializationContext.IdeaKpmModuleProto(module: IdeaKpmModule):
} }
} }
internal fun IdeaSerializationContext.IdeaKpmModule(proto: IdeaKpmModuleProto): IdeaKpmModule { internal fun IdeaKotlinSerializationContext.IdeaKpmModule(proto: IdeaKpmModuleProto): IdeaKpmModule {
return IdeaKpmModuleImpl( return IdeaKpmModuleImpl(
coordinates = IdeaKpmModuleCoordinates(proto.coordinates), coordinates = IdeaKpmModuleCoordinates(proto.coordinates),
fragments = proto.fragmentsList.map { IdeaKpmFragment(it) } + proto.variantsList.map { IdeaKpmVariant(it) } fragments = proto.fragmentsList.map { IdeaKpmFragment(it) } + proto.variantsList.map { IdeaKpmVariant(it) }
) )
} }
internal fun IdeaSerializationContext.IdeaKpmModule(data: ByteArray): IdeaKpmModule { internal fun IdeaKotlinSerializationContext.IdeaKpmModule(data: ByteArray): IdeaKpmModule {
return IdeaKpmModule(IdeaKpmModuleProto.parseFrom(data)) return IdeaKpmModule(IdeaKpmModuleProto.parseFrom(data))
} }
internal fun IdeaKpmModule.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmModule.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmModuleProto(this).toByteArray() return context.IdeaKpmModuleProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/platform.kt
+23 -23
View File
@@ -9,9 +9,9 @@ import org.jetbrains.kotlin.gradle.idea.kpm.*
import org.jetbrains.kotlin.gradle.idea.proto.Extras import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.* import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.*
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmPlatformProto(platform: IdeaKpmPlatform): IdeaKpmPlatformProto { internal fun IdeaKotlinSerializationContext.IdeaKpmPlatformProto(platform: IdeaKpmPlatform): IdeaKpmPlatformProto {
return ideaKpmPlatformProto { return ideaKpmPlatformProto {
when (platform) { when (platform) {
is IdeaKpmJsPlatformImpl -> js = IdeaKpmJsPlatformProto(platform) is IdeaKpmJsPlatformImpl -> js = IdeaKpmJsPlatformProto(platform)
@@ -23,7 +23,7 @@ internal fun IdeaSerializationContext.IdeaKpmPlatformProto(platform: IdeaKpmPlat
} }
} }
internal fun IdeaSerializationContext.IdeaKpmPlatform(proto: IdeaKpmPlatformProto): IdeaKpmPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmPlatform(proto: IdeaKpmPlatformProto): IdeaKpmPlatform {
return when (proto.platformCase) { return when (proto.platformCase) {
IdeaKpmPlatformProto.PlatformCase.JVM -> IdeaKpmJvmPlatform(proto.jvm) IdeaKpmPlatformProto.PlatformCase.JVM -> IdeaKpmJvmPlatform(proto.jvm)
IdeaKpmPlatformProto.PlatformCase.NATIVE -> IdeaKpmNativePlatform(proto.native) IdeaKpmPlatformProto.PlatformCase.NATIVE -> IdeaKpmNativePlatform(proto.native)
@@ -36,116 +36,116 @@ internal fun IdeaSerializationContext.IdeaKpmPlatform(proto: IdeaKpmPlatformProt
/* Jvm */ /* Jvm */
internal fun IdeaSerializationContext.IdeaKpmJvmPlatformProto(platform: IdeaKpmJvmPlatform): IdeaKpmJvmPlatformProto { internal fun IdeaKotlinSerializationContext.IdeaKpmJvmPlatformProto(platform: IdeaKpmJvmPlatform): IdeaKpmJvmPlatformProto {
return ideaKpmJvmPlatformProto { return ideaKpmJvmPlatformProto {
if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras) if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras)
jvmTarget = platform.jvmTarget jvmTarget = platform.jvmTarget
} }
} }
internal fun IdeaSerializationContext.IdeaKpmJvmPlatform(proto: IdeaKpmJvmPlatformProto): IdeaKpmJvmPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmJvmPlatform(proto: IdeaKpmJvmPlatformProto): IdeaKpmJvmPlatform {
return IdeaKpmJvmPlatformImpl( return IdeaKpmJvmPlatformImpl(
jvmTarget = proto.jvmTarget, jvmTarget = proto.jvmTarget,
extras = Extras(proto.extras) extras = Extras(proto.extras)
) )
} }
internal fun IdeaSerializationContext.IdeaKpmJvmPlatform(data: ByteArray): IdeaKpmJvmPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmJvmPlatform(data: ByteArray): IdeaKpmJvmPlatform {
return IdeaKpmJvmPlatform(IdeaKpmJvmPlatformProto.parseFrom(data)) return IdeaKpmJvmPlatform(IdeaKpmJvmPlatformProto.parseFrom(data))
} }
internal fun IdeaKpmJvmPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmJvmPlatform.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmJvmPlatformProto(this).toByteArray() return context.IdeaKpmJvmPlatformProto(this).toByteArray()
} }
/* Native */ /* Native */
internal fun IdeaSerializationContext.IdeaKpmNativePlatformProto(platform: IdeaKpmNativePlatform): IdeaKpmNativePlatformProto { internal fun IdeaKotlinSerializationContext.IdeaKpmNativePlatformProto(platform: IdeaKpmNativePlatform): IdeaKpmNativePlatformProto {
return ideaKpmNativePlatformProto { return ideaKpmNativePlatformProto {
if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras) if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras)
konanTarget = platform.konanTarget konanTarget = platform.konanTarget
} }
} }
internal fun IdeaSerializationContext.IdeaKpmNativePlatform(proto: IdeaKpmNativePlatformProto): IdeaKpmNativePlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmNativePlatform(proto: IdeaKpmNativePlatformProto): IdeaKpmNativePlatform {
return IdeaKpmNativePlatformImpl( return IdeaKpmNativePlatformImpl(
konanTarget = proto.konanTarget, konanTarget = proto.konanTarget,
extras = Extras(proto.extras) extras = Extras(proto.extras)
) )
} }
internal fun IdeaSerializationContext.IdeaKpmNativePlatform(data: ByteArray): IdeaKpmNativePlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmNativePlatform(data: ByteArray): IdeaKpmNativePlatform {
return IdeaKpmNativePlatform(IdeaKpmNativePlatformProto.parseFrom(data)) return IdeaKpmNativePlatform(IdeaKpmNativePlatformProto.parseFrom(data))
} }
internal fun IdeaKpmNativePlatform.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmNativePlatform.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmNativePlatformProto(this).toByteArray() return context.IdeaKpmNativePlatformProto(this).toByteArray()
} }
/* Js */ /* Js */
internal fun IdeaSerializationContext.IdeaKpmJsPlatformProto(platform: IdeaKpmJsPlatform): IdeaKpmJsPlatformProto { internal fun IdeaKotlinSerializationContext.IdeaKpmJsPlatformProto(platform: IdeaKpmJsPlatform): IdeaKpmJsPlatformProto {
return ideaKpmJsPlatformProto { return ideaKpmJsPlatformProto {
if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras) if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras)
isIr = platform.isIr isIr = platform.isIr
} }
} }
internal fun IdeaSerializationContext.IdeaKpmJsPlatform(proto: IdeaKpmJsPlatformProto): IdeaKpmJsPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmJsPlatform(proto: IdeaKpmJsPlatformProto): IdeaKpmJsPlatform {
return IdeaKpmJsPlatformImpl( return IdeaKpmJsPlatformImpl(
isIr = proto.isIr, isIr = proto.isIr,
extras = Extras(proto.extras) extras = Extras(proto.extras)
) )
} }
internal fun IdeaSerializationContext.IdeaKpmJsPlatform(data: ByteArray): IdeaKpmJsPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmJsPlatform(data: ByteArray): IdeaKpmJsPlatform {
return IdeaKpmJsPlatform(IdeaKpmJsPlatformProto.parseFrom(data)) return IdeaKpmJsPlatform(IdeaKpmJsPlatformProto.parseFrom(data))
} }
internal fun IdeaKpmJsPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmJsPlatform.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmJsPlatformProto(this).toByteArray() return context.IdeaKpmJsPlatformProto(this).toByteArray()
} }
/* Wasm */ /* Wasm */
internal fun IdeaSerializationContext.IdeaKpmWasmPlatformProto(platform: IdeaKpmWasmPlatform): IdeaKpmWasmPlatformProto { internal fun IdeaKotlinSerializationContext.IdeaKpmWasmPlatformProto(platform: IdeaKpmWasmPlatform): IdeaKpmWasmPlatformProto {
return ideaKpmWasmPlatformProto { return ideaKpmWasmPlatformProto {
if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras) if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras)
} }
} }
internal fun IdeaSerializationContext.IdeaKpmWasmPlatform(proto: IdeaKpmWasmPlatformProto): IdeaKpmWasmPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmWasmPlatform(proto: IdeaKpmWasmPlatformProto): IdeaKpmWasmPlatform {
return IdeaKpmWasmPlatformImpl( return IdeaKpmWasmPlatformImpl(
extras = Extras(proto.extras) extras = Extras(proto.extras)
) )
} }
internal fun IdeaSerializationContext.IdeaKpmWasmPlatform(data: ByteArray): IdeaKpmWasmPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmWasmPlatform(data: ByteArray): IdeaKpmWasmPlatform {
return IdeaKpmWasmPlatform(IdeaKpmWasmPlatformProto.parseFrom(data)) return IdeaKpmWasmPlatform(IdeaKpmWasmPlatformProto.parseFrom(data))
} }
internal fun IdeaKpmWasmPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmWasmPlatform.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmWasmPlatformProto(this).toByteArray() return context.IdeaKpmWasmPlatformProto(this).toByteArray()
} }
/* Unknown */ /* Unknown */
internal fun IdeaSerializationContext.IdeaKpmUnknownPlatformProto(platform: IdeaKpmUnknownPlatform): IdeaKpmUnknownPlatformProto { internal fun IdeaKotlinSerializationContext.IdeaKpmUnknownPlatformProto(platform: IdeaKpmUnknownPlatform): IdeaKpmUnknownPlatformProto {
return ideaKpmUnknownPlatformProto { return ideaKpmUnknownPlatformProto {
if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras) if (platform.extras.isNotEmpty()) extras = IdeaExtrasProto(platform.extras)
} }
} }
internal fun IdeaSerializationContext.IdeaKpmUnknownPlatform(proto: IdeaKpmUnknownPlatformProto): IdeaKpmUnknownPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmUnknownPlatform(proto: IdeaKpmUnknownPlatformProto): IdeaKpmUnknownPlatform {
return IdeaKpmUnknownPlatformImpl( return IdeaKpmUnknownPlatformImpl(
extras = Extras(proto.extras) extras = Extras(proto.extras)
) )
} }
internal fun IdeaSerializationContext.IdeaKpmUnknownPlatform(data: ByteArray): IdeaKpmUnknownPlatform { internal fun IdeaKotlinSerializationContext.IdeaKpmUnknownPlatform(data: ByteArray): IdeaKpmUnknownPlatform {
return IdeaKpmUnknownPlatform(IdeaKpmUnknownPlatformProto.parseFrom(data)) return IdeaKpmUnknownPlatform(IdeaKpmUnknownPlatformProto.parseFrom(data))
} }
internal fun IdeaKpmUnknownPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmUnknownPlatform.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmUnknownPlatformProto(this).toByteArray() return context.IdeaKpmUnknownPlatformProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/project.kt
+3 -3
View File
@@ -9,10 +9,10 @@ import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectImpl import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectImpl
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmProjectProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmProjectProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmProjectProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmProjectProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import java.io.File import java.io.File
internal fun IdeaSerializationContext.IdeaKpmProjectProto(project: IdeaKpmProject): IdeaKpmProjectProto { internal fun IdeaKotlinSerializationContext.IdeaKpmProjectProto(project: IdeaKpmProject): IdeaKpmProjectProto {
return ideaKpmProjectProto { return ideaKpmProjectProto {
gradlePluginVersion = project.gradlePluginVersion gradlePluginVersion = project.gradlePluginVersion
coreLibrariesVersion = project.coreLibrariesVersion coreLibrariesVersion = project.coreLibrariesVersion
@@ -22,7 +22,7 @@ internal fun IdeaSerializationContext.IdeaKpmProjectProto(project: IdeaKpmProjec
} }
} }
internal fun IdeaSerializationContext.IdeaKpmProject(proto: IdeaKpmProjectProto): IdeaKpmProject { internal fun IdeaKotlinSerializationContext.IdeaKpmProject(proto: IdeaKpmProjectProto): IdeaKpmProject {
return IdeaKpmProjectImpl( return IdeaKpmProjectImpl(
gradlePluginVersion = proto.gradlePluginVersion, gradlePluginVersion = proto.gradlePluginVersion,
coreLibrariesVersion = proto.coreLibrariesVersion, coreLibrariesVersion = proto.coreLibrariesVersion,
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/resolvedBinaryDependency.kt
+5 -5
View File
@@ -11,10 +11,10 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmResolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmResolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmResolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmResolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import java.io.File import java.io.File
internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependencyProto( internal fun IdeaKotlinSerializationContext.IdeaKpmResolvedBinaryDependencyProto(
dependency: IdeaKpmResolvedBinaryDependency dependency: IdeaKpmResolvedBinaryDependency
): IdeaKpmResolvedBinaryDependencyProto { ): IdeaKpmResolvedBinaryDependencyProto {
return ideaKpmResolvedBinaryDependencyProto { return ideaKpmResolvedBinaryDependencyProto {
@@ -25,7 +25,7 @@ internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependencyProto(
} }
} }
internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependency( internal fun IdeaKotlinSerializationContext.IdeaKpmResolvedBinaryDependency(
proto: IdeaKpmResolvedBinaryDependencyProto proto: IdeaKpmResolvedBinaryDependencyProto
): IdeaKpmResolvedBinaryDependency { ): IdeaKpmResolvedBinaryDependency {
return IdeaKpmResolvedBinaryDependencyImpl( return IdeaKpmResolvedBinaryDependencyImpl(
@@ -36,10 +36,10 @@ internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependency(
) )
} }
internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependency(data: ByteArray): IdeaKpmResolvedBinaryDependency { internal fun IdeaKotlinSerializationContext.IdeaKpmResolvedBinaryDependency(data: ByteArray): IdeaKpmResolvedBinaryDependency {
return IdeaKpmResolvedBinaryDependency(IdeaKpmResolvedBinaryDependencyProto.parseFrom(data)) return IdeaKpmResolvedBinaryDependency(IdeaKpmResolvedBinaryDependencyProto.parseFrom(data))
} }
internal fun IdeaKpmResolvedBinaryDependency.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmResolvedBinaryDependency.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmResolvedBinaryDependencyProto(this).toByteArray() return context.IdeaKpmResolvedBinaryDependencyProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/unresolvedBinaryDependency.kt
+5 -5
View File
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmUnresolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmUnresolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmUnresolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmUnresolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependencyProto( internal fun IdeaKotlinSerializationContext.IdeaKpmUnresolvedBinaryDependencyProto(
dependency: IdeaKpmUnresolvedBinaryDependency dependency: IdeaKpmUnresolvedBinaryDependency
): IdeaKpmUnresolvedBinaryDependencyProto { ): IdeaKpmUnresolvedBinaryDependencyProto {
return ideaKpmUnresolvedBinaryDependencyProto { return ideaKpmUnresolvedBinaryDependencyProto {
@@ -23,7 +23,7 @@ internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependencyProto(
} }
} }
internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependency(proto: IdeaKpmUnresolvedBinaryDependencyProto): IdeaKpmUnresolvedBinaryDependency { internal fun IdeaKotlinSerializationContext.IdeaKpmUnresolvedBinaryDependency(proto: IdeaKpmUnresolvedBinaryDependencyProto): IdeaKpmUnresolvedBinaryDependency {
return IdeaKpmUnresolvedBinaryDependencyImpl( return IdeaKpmUnresolvedBinaryDependencyImpl(
cause = if (proto.hasCause()) proto.cause else null, cause = if (proto.hasCause()) proto.cause else null,
coordinates = if (proto.hasCoordinates()) IdeaKpmBinaryCoordinates(proto.coordinates) else null, coordinates = if (proto.hasCoordinates()) IdeaKpmBinaryCoordinates(proto.coordinates) else null,
@@ -31,10 +31,10 @@ internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependency(proto: I
) )
} }
internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependency(data: ByteArray): IdeaKpmUnresolvedBinaryDependency { internal fun IdeaKotlinSerializationContext.IdeaKpmUnresolvedBinaryDependency(data: ByteArray): IdeaKpmUnresolvedBinaryDependency {
return IdeaKpmUnresolvedBinaryDependency(IdeaKpmUnresolvedBinaryDependencyProto.parseFrom(data)) return IdeaKpmUnresolvedBinaryDependency(IdeaKpmUnresolvedBinaryDependencyProto.parseFrom(data))
} }
internal fun IdeaKpmUnresolvedBinaryDependency.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmUnresolvedBinaryDependency.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmUnresolvedBinaryDependencyProto(this).toByteArray() return context.IdeaKpmUnresolvedBinaryDependencyProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/variant.kt
+5 -5
View File
@@ -9,10 +9,10 @@ import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariant
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariantImpl import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariantImpl
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmVariantProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmVariantProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmVariantProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmVariantProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
internal fun IdeaSerializationContext.IdeaKpmVariantProto(variant: IdeaKpmVariant): IdeaKpmVariantProto { internal fun IdeaKotlinSerializationContext.IdeaKpmVariantProto(variant: IdeaKpmVariant): IdeaKpmVariantProto {
return ideaKpmVariantProto { return ideaKpmVariantProto {
fragment = IdeaKpmFragmentProto(variant) fragment = IdeaKpmFragmentProto(variant)
variantAttributes.putAll(variant.variantAttributes) variantAttributes.putAll(variant.variantAttributes)
@@ -21,7 +21,7 @@ internal fun IdeaSerializationContext.IdeaKpmVariantProto(variant: IdeaKpmVarian
} }
} }
internal fun IdeaSerializationContext.IdeaKpmVariant(proto: IdeaKpmVariantProto): IdeaKpmVariant { internal fun IdeaKotlinSerializationContext.IdeaKpmVariant(proto: IdeaKpmVariantProto): IdeaKpmVariant {
return IdeaKpmVariantImpl( return IdeaKpmVariantImpl(
fragment = IdeaKpmFragment(proto.fragment), fragment = IdeaKpmFragment(proto.fragment),
platform = IdeaKpmPlatform(proto.platform), platform = IdeaKpmPlatform(proto.platform),
@@ -30,10 +30,10 @@ internal fun IdeaSerializationContext.IdeaKpmVariant(proto: IdeaKpmVariantProto)
) )
} }
internal fun IdeaSerializationContext.IdeaKpmVariant(data: ByteArray): IdeaKpmVariant { internal fun IdeaKotlinSerializationContext.IdeaKpmVariant(data: ByteArray): IdeaKpmVariant {
return IdeaKpmVariant(IdeaKpmVariantProto.parseFrom(data)) return IdeaKpmVariant(IdeaKpmVariantProto.parseFrom(data))
} }
internal fun IdeaKpmVariant.toByteArray(context: IdeaSerializationContext): ByteArray { internal fun IdeaKpmVariant.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKpmVariantProto(this).toByteArray() return context.IdeaKpmVariantProto(this).toByteArray()
} }
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependency.kt
+5 -5
View File
@@ -9,13 +9,13 @@ import com.google.protobuf.InvalidProtocolBufferException
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto.DependencyCase import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto.DependencyCase
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency
internal fun IdeaSerializationContext.IdeaKotlinDependencyProto(dependency: IdeaKotlinDependency): IdeaKotlinDependencyProto { internal fun IdeaKotlinSerializationContext.IdeaKotlinDependencyProto(dependency: IdeaKotlinDependency): IdeaKotlinDependencyProto {
return ideaKotlinDependencyProto { return ideaKotlinDependencyProto {
when (dependency) { when (dependency) {
is IdeaKotlinResolvedBinaryDependency -> resolvedBinaryDependency = IdeaKotlinResolvedBinaryDependencyProto(dependency) is IdeaKotlinResolvedBinaryDependency -> resolvedBinaryDependency = IdeaKotlinResolvedBinaryDependencyProto(dependency)
@@ -25,7 +25,7 @@ internal fun IdeaSerializationContext.IdeaKotlinDependencyProto(dependency: Idea
} }
} }
internal fun IdeaSerializationContext.IdeaKotlinDependency(proto: IdeaKotlinDependencyProto): IdeaKotlinDependency? { internal fun IdeaKotlinSerializationContext.IdeaKotlinDependency(proto: IdeaKotlinDependencyProto): IdeaKotlinDependency? {
return when (proto.dependencyCase) { return when (proto.dependencyCase) {
DependencyCase.SOURCE_DEPENDENCY -> IdeaKotlinSourceDependency(proto.sourceDependency) DependencyCase.SOURCE_DEPENDENCY -> IdeaKotlinSourceDependency(proto.sourceDependency)
DependencyCase.RESOLVED_BINARY_DEPENDENCY -> IdeaKotlinResolvedBinaryDependency(proto.resolvedBinaryDependency) DependencyCase.RESOLVED_BINARY_DEPENDENCY -> IdeaKotlinResolvedBinaryDependency(proto.resolvedBinaryDependency)
@@ -38,11 +38,11 @@ internal fun IdeaSerializationContext.IdeaKotlinDependency(proto: IdeaKotlinDepe
} }
} }
fun IdeaKotlinDependency.toByteArray(context: IdeaSerializationContext): ByteArray { fun IdeaKotlinDependency.toByteArray(context: IdeaKotlinSerializationContext): ByteArray {
return context.IdeaKotlinDependencyProto(this).toByteArray() return context.IdeaKotlinDependencyProto(this).toByteArray()
} }
fun IdeaSerializationContext.IdeaKotlinDependency(data: ByteArray): IdeaKotlinDependency? { fun IdeaKotlinSerializationContext.IdeaKotlinDependency(data: ByteArray): IdeaKotlinDependency? {
return try { return try {
val proto = IdeaKotlinDependencyProto.parseFrom(data) val proto = IdeaKotlinDependencyProto.parseFrom(data)
IdeaKotlinDependency(proto) IdeaKotlinDependency(proto)
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependency.kt
+3 -3
View File
@@ -9,12 +9,12 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinResolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinResolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
import org.jetbrains.kotlin.tooling.core.toMutableExtras import org.jetbrains.kotlin.tooling.core.toMutableExtras
import java.io.File import java.io.File
internal fun IdeaSerializationContext.IdeaKotlinResolvedBinaryDependencyProto( internal fun IdeaKotlinSerializationContext.IdeaKotlinResolvedBinaryDependencyProto(
dependency: IdeaKotlinResolvedBinaryDependency dependency: IdeaKotlinResolvedBinaryDependency
): IdeaKotlinResolvedBinaryDependencyProto { ): IdeaKotlinResolvedBinaryDependencyProto {
return ideaKotlinResolvedBinaryDependencyProto { return ideaKotlinResolvedBinaryDependencyProto {
@@ -25,7 +25,7 @@ internal fun IdeaSerializationContext.IdeaKotlinResolvedBinaryDependencyProto(
} }
} }
internal fun IdeaSerializationContext.IdeaKotlinResolvedBinaryDependency( internal fun IdeaKotlinSerializationContext.IdeaKotlinResolvedBinaryDependency(
proto: IdeaKotlinResolvedBinaryDependencyProto proto: IdeaKotlinResolvedBinaryDependencyProto
): IdeaKotlinResolvedBinaryDependency { ): IdeaKotlinResolvedBinaryDependency {
return IdeaKotlinResolvedBinaryDependency( return IdeaKotlinResolvedBinaryDependency(
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependency.kt
+3 -3
View File
@@ -9,11 +9,11 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinSourceDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinSourceDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency
import org.jetbrains.kotlin.tooling.core.toMutableExtras import org.jetbrains.kotlin.tooling.core.toMutableExtras
internal fun IdeaSerializationContext.IdeaKotlinSourceDependencyProto( internal fun IdeaKotlinSerializationContext.IdeaKotlinSourceDependencyProto(
dependency: IdeaKotlinSourceDependency dependency: IdeaKotlinSourceDependency
): IdeaKotlinSourceDependencyProto { ): IdeaKotlinSourceDependencyProto {
return ideaKotlinSourceDependencyProto { return ideaKotlinSourceDependencyProto {
@@ -27,7 +27,7 @@ internal fun IdeaSerializationContext.IdeaKotlinSourceDependencyProto(
} }
} }
internal fun IdeaSerializationContext.IdeaKotlinSourceDependency( internal fun IdeaKotlinSerializationContext.IdeaKotlinSourceDependency(
proto: IdeaKotlinSourceDependencyProto proto: IdeaKotlinSourceDependencyProto
): IdeaKotlinSourceDependency { ): IdeaKotlinSourceDependency {
return IdeaKotlinSourceDependency( return IdeaKotlinSourceDependency(
libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinUnresolvedBinaryDependency.kt
+3 -3
View File
@@ -9,11 +9,11 @@ import org.jetbrains.kotlin.gradle.idea.proto.Extras
import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinUnresolvedBinaryDependencyProto import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinUnresolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency
import org.jetbrains.kotlin.tooling.core.toMutableExtras import org.jetbrains.kotlin.tooling.core.toMutableExtras
internal fun IdeaSerializationContext.IdeaKotlinUnresolvedBinaryDependencyProto( internal fun IdeaKotlinSerializationContext.IdeaKotlinUnresolvedBinaryDependencyProto(
dependency: IdeaKotlinUnresolvedBinaryDependency dependency: IdeaKotlinUnresolvedBinaryDependency
): IdeaKotlinUnresolvedBinaryDependencyProto { ): IdeaKotlinUnresolvedBinaryDependencyProto {
return ideaKotlinUnresolvedBinaryDependencyProto { return ideaKotlinUnresolvedBinaryDependencyProto {
@@ -23,7 +23,7 @@ internal fun IdeaSerializationContext.IdeaKotlinUnresolvedBinaryDependencyProto(
} }
} }
internal fun IdeaSerializationContext.IdeaKotlinUnresolvedBinaryDependency( internal fun IdeaKotlinSerializationContext.IdeaKotlinUnresolvedBinaryDependency(
proto: IdeaKotlinUnresolvedBinaryDependencyProto proto: IdeaKotlinUnresolvedBinaryDependencyProto
): IdeaKotlinUnresolvedBinaryDependency { ): IdeaKotlinUnresolvedBinaryDependency {
return IdeaKotlinUnresolvedBinaryDependency( return IdeaKotlinUnresolvedBinaryDependency(
libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/AbstractSerializationTest.kt
+4 -4
View File
@@ -5,14 +5,14 @@
package org.jetbrains.kotlin.gradle.idea.proto package org.jetbrains.kotlin.gradle.idea.proto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaKotlinSerializationLogger
import kotlin.test.assertEquals import kotlin.test.assertEquals
abstract class AbstractSerializationTest<T : Any> : IdeaSerializationContext { abstract class AbstractSerializationTest<T : Any> : IdeaKotlinSerializationContext {
final override val logger = TestIdeaSerializationLogger() final override val logger = TestIdeaKotlinSerializationLogger()
final override val extrasSerializationExtension = TestIdeaExtrasSerializationExtension final override val extrasSerializationExtension = TestIdeaExtrasSerializationExtension
abstract fun serialize(value: T): ByteArray abstract fun serialize(value: T): ByteArray
libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/kpm/ContainerTest.kt
+4 -4
View File
@@ -8,17 +8,17 @@ package org.jetbrains.kotlin.gradle.idea.proto.kpm
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmSchemaInfoProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.IdeaKpmSchemaInfoProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmContainerProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmContainerProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmSchemaInfoProto import org.jetbrains.kotlin.gradle.idea.proto.generated.kpm.ideaKpmSchemaInfoProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmInstances import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmInstances
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaKotlinSerializationLogger
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertNull import kotlin.test.assertNull
import kotlin.test.assertTrue import kotlin.test.assertTrue
class ContainerTest : IdeaSerializationContext { class ContainerTest : IdeaKotlinSerializationContext {
override val logger = TestIdeaSerializationLogger() override val logger = TestIdeaKotlinSerializationLogger()
override val extrasSerializationExtension = TestIdeaExtrasSerializationExtension override val extrasSerializationExtension = TestIdeaExtrasSerializationExtension
@Test @Test
libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencySerializationTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.gradle.idea.proto.tcs package org.jetbrains.kotlin.gradle.idea.proto.tcs
import org.jetbrains.kotlin.gradle.idea.proto.AbstractSerializationTest import org.jetbrains.kotlin.gradle.idea.proto.AbstractSerializationTest
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinInstances import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinInstances
import kotlin.test.Test import kotlin.test.Test
@@ -40,7 +40,7 @@ class IdeaKotlinDependencySerializationTest : AbstractSerializationTest<IdeaKotl
assertNull(IdeaKotlinDependency(byteArrayOf())) assertNull(IdeaKotlinDependency(byteArrayOf()))
if (logger.reports.size != 1) fail("Expected exactly one report in logger. Found ${logger.reports}") if (logger.reports.size != 1) fail("Expected exactly one report in logger. Found ${logger.reports}")
val report = logger.reports.first() val report = logger.reports.first()
assertEquals(IdeaSerializationLogger.Severity.ERROR, report.severity) assertEquals(IdeaKotlinSerializationLogger.Severity.ERROR, report.severity)
assertEquals("Dependency not set", report.message) assertEquals("Dependency not set", report.message)
} }
} }
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializationExtension.kt
-46
View File
@@ -1,46 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.idea.serialize
import org.jetbrains.kotlin.tooling.core.Extras
interface IdeaExtrasSerializationExtension {
fun <T : Any> serializer(key: Extras.Key<T>): IdeaExtrasSerializer<T>?
object Empty : IdeaExtrasSerializationExtension {
override fun <T : Any> serializer(key: Extras.Key<T>): IdeaExtrasSerializer<T>? = null
}
}
interface IdeaExtrasSerializationExtensionBuilder {
fun <T : Any> register(key: Extras.Key<T>, serializer: IdeaExtrasSerializer<T>)
}
fun IdeaExtrasSerializationExtension(
builder: IdeaExtrasSerializationExtensionBuilder.() -> Unit
): IdeaExtrasSerializationExtension {
return IdeaExtrasSerializationExtensionImpl(
IdeaExtrasSerializationExtensionBuilderImpl().apply(builder).serializers
)
}
private class IdeaExtrasSerializationExtensionBuilderImpl : IdeaExtrasSerializationExtensionBuilder {
val serializers = mutableMapOf<Extras.Key<*>, IdeaExtrasSerializer<*>>()
override fun <T : Any> register(key: Extras.Key<T>, serializer: IdeaExtrasSerializer<T>) {
serializers[key] = serializer
}
}
private class IdeaExtrasSerializationExtensionImpl(
private val map: Map<Extras.Key<*>, IdeaExtrasSerializer<*>>
) : IdeaExtrasSerializationExtension {
override fun <T : Any> serializer(key: Extras.Key<T>): IdeaExtrasSerializer<T>? {
@Suppress("unchecked_cast")
return map[key] as? IdeaExtrasSerializer<T>
}
}
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializer.kt
-27
View File
@@ -1,27 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.idea.serialize
import kotlin.reflect.KClass
interface IdeaExtrasSerializer<T : Any> {
fun serialize(context: IdeaSerializationContext, value: T): ByteArray?
fun deserialize(context: IdeaSerializationContext, data: ByteArray): T?
companion object {
/**
* Returns a [IdeaExtrasSerializer] based upon [java.io.Serializable]
*/
fun <T : Any> javaIoSerializable(clazz: KClass<T>): IdeaExtrasSerializer<T> {
return IdeaJavaIoSerializableExtrasSerializer(clazz)
}
inline fun <reified T : Any> javaIoSerializable(): IdeaExtrasSerializer<T> {
return javaIoSerializable(T::class)
}
}
}
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinExtrasSerializationExtension.kt
+45
View File
@@ -0,0 +1,45 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.idea.serialize
import org.jetbrains.kotlin.tooling.core.Extras
interface IdeaKotlinExtrasSerializationExtension {
fun <T : Any> serializer(key: Extras.Key<T>): IdeaKotlinExtrasSerializer<T>?
object Empty : IdeaKotlinExtrasSerializationExtension {
override fun <T : Any> serializer(key: Extras.Key<T>): IdeaKotlinExtrasSerializer<T>? = null
}
}
interface IdeaKotlinExtrasSerializationExtensionBuilder {
fun <T : Any> register(key: Extras.Key<T>, serializer: IdeaKotlinExtrasSerializer<T>)
}
fun IdeaKotlinExtrasSerializationExtension(
builder: IdeaKotlinExtrasSerializationExtensionBuilder.() -> Unit
): IdeaKotlinExtrasSerializationExtension {
return IdeaKotlinExtrasSerializationExtensionImpl(
IdeaKotlinExtrasSerializationExtensionBuilderImpl().apply(builder).serializers
)
}
private class IdeaKotlinExtrasSerializationExtensionBuilderImpl : IdeaKotlinExtrasSerializationExtensionBuilder {
val serializers = mutableMapOf<Extras.Key<*>, IdeaKotlinExtrasSerializer<*>>()
override fun <T : Any> register(key: Extras.Key<T>, serializer: IdeaKotlinExtrasSerializer<T>) {
serializers[key] = serializer
}
}
private class IdeaKotlinExtrasSerializationExtensionImpl(
private val map: Map<Extras.Key<*>, IdeaKotlinExtrasSerializer<*>>
) : IdeaKotlinExtrasSerializationExtension {
override fun <T : Any> serializer(key: Extras.Key<T>): IdeaKotlinExtrasSerializer<T>? {
@Suppress("unchecked_cast")
return map[key] as? IdeaKotlinExtrasSerializer<T>
}
}
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinExtrasSerializer.kt
+27
View File
@@ -0,0 +1,27 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.idea.serialize
import kotlin.reflect.KClass
interface IdeaKotlinExtrasSerializer<T : Any> {
fun serialize(context: IdeaKotlinSerializationContext, value: T): ByteArray?
fun deserialize(context: IdeaKotlinSerializationContext, data: ByteArray): T?
companion object {
/**
* Returns a [IdeaKotlinExtrasSerializer] based upon [java.io.Serializable]
*/
fun <T : Any> javaIoSerializable(clazz: KClass<T>): IdeaKotlinExtrasSerializer<T> {
return IdeaKotlinJavaIoSerializableExtrasSerializer(clazz)
}
inline fun <reified T : Any> javaIoSerializable(): IdeaKotlinExtrasSerializer<T> {
return javaIoSerializable(T::class)
}
}
}
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializer.kt → libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinJavaIoSerializableExtrasSerializer.kt
+4 -4
View File
@@ -11,11 +11,11 @@ import java.io.ObjectInputStream
import java.io.ObjectOutputStream import java.io.ObjectOutputStream
import kotlin.reflect.KClass import kotlin.reflect.KClass
internal class IdeaJavaIoSerializableExtrasSerializer<T : Any>( internal class IdeaKotlinJavaIoSerializableExtrasSerializer<T : Any>(
private val clazz: KClass<T> private val clazz: KClass<T>
) : IdeaExtrasSerializer<T> { ) : IdeaKotlinExtrasSerializer<T> {
override fun serialize(context: IdeaSerializationContext, value: T): ByteArray? { override fun serialize(context: IdeaKotlinSerializationContext, value: T): ByteArray? {
return try { return try {
ByteArrayOutputStream().use { byteArrayOutputStream -> ByteArrayOutputStream().use { byteArrayOutputStream ->
ObjectOutputStream(byteArrayOutputStream).use { oos -> oos.writeObject(value) } ObjectOutputStream(byteArrayOutputStream).use { oos -> oos.writeObject(value) }
@@ -27,7 +27,7 @@ internal class IdeaJavaIoSerializableExtrasSerializer<T : Any>(
} }
} }
override fun deserialize(context: IdeaSerializationContext, data: ByteArray): T? { override fun deserialize(context: IdeaKotlinSerializationContext, data: ByteArray): T? {
return try { return try {
ObjectInputStream(ByteArrayInputStream(data)).use { stream -> clazz.java.cast(stream.readObject()) } ObjectInputStream(ByteArrayInputStream(data)).use { stream -> clazz.java.cast(stream.readObject()) }
} catch (t: Throwable) { } catch (t: Throwable) {
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationContext.kt → libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext.kt
+3 -3
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.gradle.idea.serialize package org.jetbrains.kotlin.gradle.idea.serialize
interface IdeaSerializationContext { interface IdeaKotlinSerializationContext {
val logger: IdeaSerializationLogger val logger: IdeaKotlinSerializationLogger
val extrasSerializationExtension: IdeaExtrasSerializationExtension val extrasSerializationExtension: IdeaKotlinExtrasSerializationExtension
} }
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationLogger.kt → libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationLogger.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.gradle.idea.serialize package org.jetbrains.kotlin.gradle.idea.serialize
interface IdeaSerializationLogger { interface IdeaKotlinSerializationLogger {
enum class Severity { enum class Severity {
WARNING, WARNING,
ERROR, ERROR,
@@ -15,7 +15,7 @@ interface IdeaSerializationLogger {
fun warn(message: String, cause: Throwable? = null) = report(Severity.WARNING, message, cause) fun warn(message: String, cause: Throwable? = null) = report(Severity.WARNING, message, cause)
fun error(message: String, cause: Throwable? = null) = report(Severity.ERROR, message, cause) fun error(message: String, cause: Throwable? = null) = report(Severity.ERROR, message, cause)
object None : IdeaSerializationLogger { object None : IdeaKotlinSerializationLogger {
override fun report(severity: Severity, message: String, cause: Throwable?) = Unit override fun report(severity: Severity, message: String, cause: Throwable?) = Unit
} }
} }
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency.kt
+1 -1
View File
@@ -24,4 +24,4 @@ data class IdeaKotlinSourceDependency(
internal companion object { internal companion object {
const val serialVersionUID = 0L const val serialVersionUID = 0L
} }
} }
libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializerTest.kt
+10 -10
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.gradle.idea.serialize package org.jetbrains.kotlin.gradle.idea.serialize
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaKotlinSerializationContext
import org.jetbrains.kotlin.tooling.core.withLinearClosure import org.jetbrains.kotlin.tooling.core.withLinearClosure
import org.junit.Test import org.junit.Test
import java.io.Serializable import java.io.Serializable
@@ -18,8 +18,8 @@ class IdeaJavaIoSerializableExtrasSerializerTest {
@Test @Test
fun `serialize - deserialize - String`() { fun `serialize - deserialize - String`() {
val context = TestIdeaSerializationContext() val context = TestIdeaKotlinSerializationContext()
val serializer = IdeaExtrasSerializer.javaIoSerializable<String>() val serializer = IdeaKotlinExtrasSerializer.javaIoSerializable<String>()
val binary = assertNotNull( val binary = assertNotNull(
serializer.serialize(context, "Sunny Cash"), serializer.serialize(context, "Sunny Cash"),
"Failed to serialize: ${context.logger.reports}" "Failed to serialize: ${context.logger.reports}"
@@ -34,12 +34,12 @@ class IdeaJavaIoSerializableExtrasSerializerTest {
fun `serialize - deserialize - non serializable object`() { fun `serialize - deserialize - non serializable object`() {
class ThisIsNotSerializable class ThisIsNotSerializable
val context = TestIdeaSerializationContext() val context = TestIdeaKotlinSerializationContext()
val serializer = IdeaExtrasSerializer.javaIoSerializable<ThisIsNotSerializable>() val serializer = IdeaKotlinExtrasSerializer.javaIoSerializable<ThisIsNotSerializable>()
assertNull(serializer.serialize(context, ThisIsNotSerializable()), "Expected null return value for non serializable object") assertNull(serializer.serialize(context, ThisIsNotSerializable()), "Expected null return value for non serializable object")
val serializationFailureReportsCount = context.logger.reports.count { report -> val serializationFailureReportsCount = context.logger.reports.count { report ->
report.message.startsWith(IdeaJavaIoSerializableExtrasSerializer.ErrorMessages.SERIALIZATION_FAILURE) report.message.startsWith(IdeaKotlinJavaIoSerializableExtrasSerializer.ErrorMessages.SERIALIZATION_FAILURE)
} }
assertEquals( assertEquals(
@@ -58,8 +58,8 @@ class IdeaJavaIoSerializableExtrasSerializerTest {
fun readResolve(): Any = throw exception fun readResolve(): Any = throw exception
} }
val context = TestIdeaSerializationContext() val context = TestIdeaKotlinSerializationContext()
val serializer = IdeaExtrasSerializer.javaIoSerializable<NotDeserializable>() val serializer = IdeaKotlinExtrasSerializer.javaIoSerializable<NotDeserializable>()
val binary = assertNotNull(serializer.serialize(context, NotDeserializable())) val binary = assertNotNull(serializer.serialize(context, NotDeserializable()))
assertNull(serializer.deserialize(context, binary)) assertNull(serializer.deserialize(context, binary))
@@ -72,8 +72,8 @@ class IdeaJavaIoSerializableExtrasSerializerTest {
val reportMessage = assertNotNull(report.message, "Expected message in issue report") val reportMessage = assertNotNull(report.message, "Expected message in issue report")
assertTrue( assertTrue(
reportMessage.startsWith(IdeaJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE), reportMessage.startsWith(IdeaKotlinJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE),
"Expected issue report to start with ${IdeaJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE}" "Expected issue report to start with ${IdeaKotlinJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE}"
) )
libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/CompatibilityTestUtil.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.gradle.idea.testUtils package org.jetbrains.kotlin.gradle.idea.testUtils
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger
import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmClassLoaderProjectSerializer import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmClassLoaderProjectSerializer
import java.io.File import java.io.File
import java.net.URLClassLoader import java.net.URLClassLoader
@@ -49,7 +49,7 @@ fun deserializeIdeaKpmProjectWithBackwardsCompatibleClasses(project: ByteArray):
) )
assertEquals( assertEquals(
0, serializer.reports.count { it.severity > IdeaSerializationLogger.Severity.WARNING }, 0, serializer.reports.count { it.severity > IdeaKotlinSerializationLogger.Severity.WARNING },
"Expected no severe deserialization reports. Found ${serializer.reports}" "Expected no severe deserialization reports. Found ${serializer.reports}"
) )
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/kpm/TestIdeaKpmClassLoaderProjectSerializer.kt
+6 -6
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.gradle.idea.testFixtures.kpm
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.proto.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.idea.proto.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.proto.kpm.toByteArray import org.jetbrains.kotlin.gradle.idea.proto.kpm.toByteArray
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaKotlinSerializationLogger
import org.jetbrains.kotlin.gradle.idea.testFixtures.utils.copy import org.jetbrains.kotlin.gradle.idea.testFixtures.utils.copy
import org.jetbrains.kotlin.tooling.core.UnsafeApi import org.jetbrains.kotlin.tooling.core.UnsafeApi
import java.lang.reflect.InvocationHandler import java.lang.reflect.InvocationHandler
@@ -44,12 +44,12 @@ fun TestIdeaKpmClassLoaderProjectSerializer(classLoader: ClassLoader): TestIdeaK
/** /**
* Test Util to serialize / deserialize [IdeaKpmProject] within a dedicated ClassLoader. * Test Util to serialize / deserialize [IdeaKpmProject] within a dedicated ClassLoader.
* The serialization context used will be [TestIdeaSerializationContext]. Note, that this context * The serialization context used will be [TestIdeaKotlinSerializationContext]. Note, that this context
* might also depend on the version shipped by the specified [ClassLoader]. * might also depend on the version shipped by the specified [ClassLoader].
*/ */
interface TestIdeaKpmClassLoaderProjectSerializer { interface TestIdeaKpmClassLoaderProjectSerializer {
val classLoader: ClassLoader val classLoader: ClassLoader
val reports: List<TestIdeaSerializationLogger.Report> val reports: List<TestIdeaKotlinSerializationLogger.Report>
fun serialize(project: Any): ByteArray fun serialize(project: Any): ByteArray
fun deserialize(data: ByteArray): Any? fun deserialize(data: ByteArray): Any?
} }
@@ -58,9 +58,9 @@ interface TestIdeaKpmClassLoaderProjectSerializer {
internal class TestIdeaKpmProtoClassLoaderProjectSerializer( internal class TestIdeaKpmProtoClassLoaderProjectSerializer(
override val classLoader: ClassLoader override val classLoader: ClassLoader
) : TestIdeaKpmClassLoaderProjectSerializer { ) : TestIdeaKpmClassLoaderProjectSerializer {
private val context = TestIdeaSerializationContext() private val context = TestIdeaKotlinSerializationContext()
override val reports: List<TestIdeaSerializationLogger.Report> override val reports: List<TestIdeaKotlinSerializationLogger.Report>
get() = context.logger.reports get() = context.logger.reports
override fun serialize(project: Any): ByteArray { override fun serialize(project: Any): ByteArray {
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaExtrasSerializationExtension.kt
+8 -8
View File
@@ -5,23 +5,23 @@
package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.Extras
import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasKeyOf
import org.jetbrains.kotlin.tooling.core.extrasTypeOf import org.jetbrains.kotlin.tooling.core.extrasTypeOf
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
object TestIdeaExtrasSerializationExtension : IdeaExtrasSerializationExtension { object TestIdeaExtrasSerializationExtension : IdeaKotlinExtrasSerializationExtension {
val ignoredStringKey = extrasKeyOf<String>("ignored") val ignoredStringKey = extrasKeyOf<String>("ignored")
val anySerializableKey = extrasKeyOf<Any>("serializable") val anySerializableKey = extrasKeyOf<Any>("serializable")
override fun <T : Any> serializer(key: Extras.Key<T>): IdeaExtrasSerializer<T>? = when { override fun <T : Any> serializer(key: Extras.Key<T>): IdeaKotlinExtrasSerializer<T>? = when {
key == ignoredStringKey -> null key == ignoredStringKey -> null
key == anySerializableKey -> IdeaExtrasSerializer.javaIoSerializable<Any>() key == anySerializableKey -> IdeaKotlinExtrasSerializer.javaIoSerializable<Any>()
key.type == extrasTypeOf<String>() -> TestIdeaStringExtrasSerializer key.type == extrasTypeOf<String>() -> TestIdeaStringKotlinExtrasSerializer
key.type == extrasTypeOf<Int>() -> TestIdeaIntExtrasSerializer key.type == extrasTypeOf<Int>() -> TestIdeaIntKotlinExtrasSerializer
else -> null else -> null
} as? IdeaExtrasSerializer<T> } as? IdeaKotlinExtrasSerializer<T>
} }
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaIntExtrasSerializer.kt → libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaIntKotlinExtrasSerializer.kt
+5 -5
View File
@@ -5,16 +5,16 @@
package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import java.nio.ByteBuffer import java.nio.ByteBuffer
object TestIdeaIntExtrasSerializer : IdeaExtrasSerializer<Int> { object TestIdeaIntKotlinExtrasSerializer : IdeaKotlinExtrasSerializer<Int> {
override fun serialize(context: IdeaSerializationContext, value: Int): ByteArray { override fun serialize(context: IdeaKotlinSerializationContext, value: Int): ByteArray {
return ByteBuffer.allocate(Int.SIZE_BYTES).putInt(value).array() return ByteBuffer.allocate(Int.SIZE_BYTES).putInt(value).array()
} }
override fun deserialize(context: IdeaSerializationContext, data: ByteArray): Int { override fun deserialize(context: IdeaKotlinSerializationContext, data: ByteArray): Int {
return ByteBuffer.wrap(data).int return ByteBuffer.wrap(data).int
} }
} }
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaSerializationContext.kt → libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaKotlinSerializationContext.kt
+3 -3
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
class TestIdeaSerializationContext : IdeaSerializationContext { class TestIdeaKotlinSerializationContext : IdeaKotlinSerializationContext {
override val logger = TestIdeaSerializationLogger() override val logger = TestIdeaKotlinSerializationLogger()
override val extrasSerializationExtension = TestIdeaExtrasSerializationExtension override val extrasSerializationExtension = TestIdeaExtrasSerializationExtension
} }
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaSerializationLogger.kt → libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaKotlinSerializationLogger.kt
+3 -3
View File
@@ -5,11 +5,11 @@
package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger.Severity import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger.Severity
import java.io.Serializable import java.io.Serializable
class TestIdeaSerializationLogger : IdeaSerializationLogger { class TestIdeaKotlinSerializationLogger : IdeaKotlinSerializationLogger {
data class Report( data class Report(
val severity: Severity, val severity: Severity,
val message: String, val message: String,
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaStringExtrasSerializer.kt
-14
View File
@@ -1,14 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext
object TestIdeaStringExtrasSerializer : IdeaExtrasSerializer<String> {
override fun serialize(context: IdeaSerializationContext, value: String): ByteArray = value.encodeToByteArray()
override fun deserialize(context: IdeaSerializationContext, data: ByteArray) = data.decodeToString()
}
libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/serialize/TestIdeaStringKotlinExtrasSerializer.kt
+14
View File
@@ -0,0 +1,14 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.idea.testFixtures.serialize
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
object TestIdeaStringKotlinExtrasSerializer : IdeaKotlinExtrasSerializer<String> {
override fun serialize(context: IdeaKotlinSerializationContext, value: String): ByteArray = value.encodeToByteArray()
override fun deserialize(context: IdeaKotlinSerializationContext, data: ByteArray) = data.decodeToString()
}
libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetExtension.kt
+2 -2
View File
@@ -11,7 +11,7 @@ package org.jetbrains.kotlin.gradle.android
import com.android.build.gradle.AppExtension import com.android.build.gradle.AppExtension
import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryExtension
import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.findByType
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.external.ideaKpmProjectModelBuilder import org.jetbrains.kotlin.gradle.kpm.external.ideaKpmProjectModelBuilder
import org.jetbrains.kotlin.gradle.kpm.external.project import org.jetbrains.kotlin.gradle.kpm.external.project
@@ -34,6 +34,6 @@ fun KotlinPm20ProjectExtension.androidPrototype() {
setupIdeaKpmFragmentDependencyResolver() setupIdeaKpmFragmentDependencyResolver()
ideaKpmProjectModelBuilder.registerExtrasSerializationExtension { ideaKpmProjectModelBuilder.registerExtrasSerializationExtension {
register(androidDslKey, IdeaExtrasSerializer.javaIoSerializable()) register(androidDslKey, IdeaKotlinExtrasSerializer.javaIoSerializable())
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilder.kt
+7 -7
View File
@@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea
import org.jetbrains.kotlin.compilerRunner.konanHome import org.jetbrains.kotlin.compilerRunner.konanHome
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectImpl import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectImpl
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtensionBuilder import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtensionBuilder
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.DependencyResolutionLevel.Default import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.DependencyResolutionLevel.Default
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.DependencyResolutionLevel.Overwrite import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.DependencyResolutionLevel.Overwrite
@@ -133,10 +133,10 @@ interface IdeaKpmProjectModelBuilder {
@ExternalVariantApi @ExternalVariantApi
fun registerExtrasSerializationExtension( fun registerExtrasSerializationExtension(
extension: IdeaExtrasSerializationExtension extension: IdeaKotlinExtrasSerializationExtension
) )
fun buildSerializationContext(): IdeaSerializationContext fun buildSerializationContext(): IdeaKotlinSerializationContext
fun buildIdeaKpmProject(): IdeaKpmProject fun buildIdeaKpmProject(): IdeaKpmProject
@@ -171,7 +171,7 @@ operator fun FragmentConstraint.not() = FragmentConstraint { fragment ->
@ExternalVariantApi @ExternalVariantApi
fun IdeaKpmProjectModelBuilder.registerExtrasSerializationExtension( fun IdeaKpmProjectModelBuilder.registerExtrasSerializationExtension(
builder: IdeaExtrasSerializationExtensionBuilder.() -> Unit builder: IdeaKotlinExtrasSerializationExtensionBuilder.() -> Unit
) { ) {
registerExtrasSerializationExtension(IdeaExtrasSerializationExtension(builder)) registerExtrasSerializationExtension(IdeaKotlinExtrasSerializationExtension(builder))
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilderImpl.kt
+5 -5
View File
@@ -12,8 +12,8 @@ import org.gradle.tooling.provider.model.ToolingModelBuilder
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectContainer import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectContainer
import org.jetbrains.kotlin.gradle.idea.proto.kpm.toByteArray import org.jetbrains.kotlin.gradle.idea.proto.kpm.toByteArray
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.* import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.*
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
@@ -48,7 +48,7 @@ internal class IdeaKpmProjectModelBuilderImpl @UnsafeApi("Use factory methods in
private val registeredDependencyResolvers = mutableListOf<RegisteredDependencyResolver>() private val registeredDependencyResolvers = mutableListOf<RegisteredDependencyResolver>()
private val registeredDependencyTransformers = mutableListOf<RegisteredDependencyTransformer>() private val registeredDependencyTransformers = mutableListOf<RegisteredDependencyTransformer>()
private val registeredDependencyEffects = mutableListOf<RegisteredDependencyEffect>() private val registeredDependencyEffects = mutableListOf<RegisteredDependencyEffect>()
private val registeredExtrasSerializationExtensions = mutableListOf<IdeaExtrasSerializationExtension>() private val registeredExtrasSerializationExtensions = mutableListOf<IdeaKotlinExtrasSerializationExtension>()
override fun registerDependencyResolver( override fun registerDependencyResolver(
resolver: IdeaKpmDependencyResolver, resolver: IdeaKpmDependencyResolver,
@@ -81,12 +81,12 @@ internal class IdeaKpmProjectModelBuilderImpl @UnsafeApi("Use factory methods in
} }
override fun registerExtrasSerializationExtension( override fun registerExtrasSerializationExtension(
extension: IdeaExtrasSerializationExtension extension: IdeaKotlinExtrasSerializationExtension
) { ) {
registeredExtrasSerializationExtensions.add(extension) registeredExtrasSerializationExtensions.add(extension)
} }
override fun buildSerializationContext(): IdeaSerializationContext { override fun buildSerializationContext(): IdeaKotlinSerializationContext {
return IdeaSerializationContext( return IdeaSerializationContext(
logger = extension.project.logger, logger = extension.project.logger,
extrasSerializationExtensions = registeredExtrasSerializationExtensions.toList() extrasSerializationExtensions = registeredExtrasSerializationExtensions.toList()
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSerializationContextImpl.kt
+18 -18
View File
@@ -6,32 +6,32 @@
package org.jetbrains.kotlin.gradle.kpm.idea package org.jetbrains.kotlin.gradle.kpm.idea
import org.gradle.api.logging.Logger import org.gradle.api.logging.Logger
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger
import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.Extras
internal fun IdeaSerializationContext( internal fun IdeaSerializationContext(
logger: Logger, extrasSerializationExtensions: List<IdeaExtrasSerializationExtension> logger: Logger, extrasSerializationExtensions: List<IdeaKotlinExtrasSerializationExtension>
): IdeaSerializationContext { ): IdeaKotlinSerializationContext {
return IdeaSerializationContextImpl( return IdeaKotlinSerializationContextImpl(
extrasSerializationExtension = IdeaKpmCompositeExtrasSerializationExtension(logger, extrasSerializationExtensions), extrasSerializationExtension = IdeaKpmCompositeExtrasSerializationExtension(logger, extrasSerializationExtensions),
logger = IdeaKpmSerializationLoggerImpl(logger) logger = IdeaKpmSerializationLoggerImpl(logger)
) )
} }
private class IdeaSerializationContextImpl( private class IdeaKotlinSerializationContextImpl(
override val extrasSerializationExtension: IdeaExtrasSerializationExtension, override val extrasSerializationExtension: IdeaKotlinExtrasSerializationExtension,
override val logger: IdeaSerializationLogger override val logger: IdeaKotlinSerializationLogger
) : IdeaSerializationContext ) : IdeaKotlinSerializationContext
/* Simple composite implementation, reporting conflicting extensions */ /* Simple composite implementation, reporting conflicting extensions */
private class IdeaKpmCompositeExtrasSerializationExtension( private class IdeaKpmCompositeExtrasSerializationExtension(
private val logger: Logger, private val logger: Logger,
private val extensions: List<IdeaExtrasSerializationExtension> private val extensions: List<IdeaKotlinExtrasSerializationExtension>
) : IdeaExtrasSerializationExtension { ) : IdeaKotlinExtrasSerializationExtension {
override fun <T : Any> serializer(key: Extras.Key<T>): IdeaExtrasSerializer<T>? { override fun <T : Any> serializer(key: Extras.Key<T>): IdeaKotlinExtrasSerializer<T>? {
val serializers = extensions.mapNotNull { it.serializer(key) } val serializers = extensions.mapNotNull { it.serializer(key) }
if (serializers.size == 1) { if (serializers.size == 1) {
@@ -50,12 +50,12 @@ private class IdeaKpmCompositeExtrasSerializationExtension(
/* Simple Gradle logger based implementation */ /* Simple Gradle logger based implementation */
private class IdeaKpmSerializationLoggerImpl( private class IdeaKpmSerializationLoggerImpl(
private val logger: Logger, private val logger: Logger,
) : IdeaSerializationLogger { ) : IdeaKotlinSerializationLogger {
override fun report(severity: IdeaSerializationLogger.Severity, message: String, cause: Throwable?) { override fun report(severity: IdeaKotlinSerializationLogger.Severity, message: String, cause: Throwable?) {
val text = "[KPM] Serialization: $message" val text = "[KPM] Serialization: $message"
when (severity) { when (severity) {
IdeaSerializationLogger.Severity.WARNING -> logger.warn(text, cause) IdeaKotlinSerializationLogger.Severity.WARNING -> logger.warn(text, cause)
IdeaSerializationLogger.Severity.ERROR -> logger.error(text, cause) IdeaKotlinSerializationLogger.Severity.ERROR -> logger.error(text, cause)
} }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmProjectModelBuilderFactory.kt
+2 -2
View File
@@ -7,7 +7,7 @@
package org.jetbrains.kotlin.gradle.kpm.idea package org.jetbrains.kotlin.gradle.kpm.idea
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragmentGranularMetadataResolverFactory import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragmentGranularMetadataResolverFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
@@ -99,6 +99,6 @@ internal fun IdeaKpmProjectModelBuilder.Companion.default(
registerExtrasSerializationExtension { registerExtrasSerializationExtension {
/* For transporting debugging breadcrumbs into the ide */ /* For transporting debugging breadcrumbs into the ide */
register(kotlinDebugKey, IdeaExtrasSerializer.javaIoSerializable()) register(kotlinDebugKey, IdeaKotlinExtrasSerializer.javaIoSerializable())
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt
+5 -5
View File
@@ -9,8 +9,8 @@ package org.jetbrains.kotlin.gradle.plugin.ide
import org.gradle.api.Project import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtensionBuilder import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtensionBuilder
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.extraProperties import org.jetbrains.kotlin.gradle.plugin.extraProperties
@@ -58,7 +58,7 @@ interface IdeMultiplatformImport {
@ExternalKotlinTargetApi @ExternalKotlinTargetApi
fun registerExtrasSerializationExtension( fun registerExtrasSerializationExtension(
extension: IdeaExtrasSerializationExtension extension: IdeaKotlinExtrasSerializationExtension
) )
/** /**
@@ -156,7 +156,7 @@ internal val Project.kotlinIdeMultiplatformImport: IdeMultiplatformImport get()
@ExternalKotlinTargetApi @ExternalKotlinTargetApi
fun IdeMultiplatformImport.registerExtrasSerializationExtension( fun IdeMultiplatformImport.registerExtrasSerializationExtension(
builder: IdeaExtrasSerializationExtensionBuilder.() -> Unit builder: IdeaKotlinExtrasSerializationExtensionBuilder.() -> Unit
) { ) {
registerExtrasSerializationExtension(IdeaExtrasSerializationExtension(builder)) registerExtrasSerializationExtension(IdeaKotlinExtrasSerializationExtension(builder))
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.gradle.plugin.ide package org.jetbrains.kotlin.gradle.plugin.ide
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.kpm.idea.kotlinDebugKey import org.jetbrains.kotlin.gradle.kpm.idea.kotlinDebugKey
import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeDependsOnDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeDependsOnDependencyResolver
import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeTransformedMetadataDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeTransformedMetadataDependencyResolver
@@ -29,7 +29,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla
) )
registerExtrasSerializationExtension { registerExtrasSerializationExtension {
register(kotlinDebugKey, IdeaExtrasSerializer.javaIoSerializable()) register(kotlinDebugKey, IdeaKotlinExtrasSerializer.javaIoSerializable())
} }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportImpl.kt
+5 -5
View File
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.gradle.plugin.ide
import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.idea.proto.tcs.toByteArray import org.jetbrains.kotlin.gradle.idea.proto.tcs.toByteArray
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializationExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaSerializationContext import org.jetbrains.kotlin.gradle.kpm.idea.IdeaSerializationContext
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
@@ -64,7 +64,7 @@ internal class IdeMultiplatformImportImpl(
private val registeredDependencyResolvers = mutableListOf<RegisteredDependencyResolver>() private val registeredDependencyResolvers = mutableListOf<RegisteredDependencyResolver>()
private val registeredDependencyTransformers = mutableListOf<RegisteredDependencyTransformer>() private val registeredDependencyTransformers = mutableListOf<RegisteredDependencyTransformer>()
private val registeredDependencyEffects = mutableListOf<RegisteredDependencyEffect>() private val registeredDependencyEffects = mutableListOf<RegisteredDependencyEffect>()
private val registeredExtrasSerializationExtensions = mutableListOf<IdeaExtrasSerializationExtension>() private val registeredExtrasSerializationExtensions = mutableListOf<IdeaKotlinExtrasSerializationExtension>()
@ExternalKotlinTargetApi @ExternalKotlinTargetApi
override fun registerDependencyResolver( override fun registerDependencyResolver(
@@ -97,7 +97,7 @@ internal class IdeMultiplatformImportImpl(
} }
@ExternalKotlinTargetApi @ExternalKotlinTargetApi
override fun registerExtrasSerializationExtension(extension: IdeaExtrasSerializationExtension) { override fun registerExtrasSerializationExtension(extension: IdeaKotlinExtrasSerializationExtension) {
registeredExtrasSerializationExtensions.add(extension) registeredExtrasSerializationExtensions.add(extension)
} }
@@ -149,7 +149,7 @@ internal class IdeMultiplatformImportImpl(
.forEach { it.effect(sourceSet, dependencies) } .forEach { it.effect(sourceSet, dependencies) }
} }
private fun createSerializationContext(): IdeaSerializationContext { private fun createSerializationContext(): IdeaKotlinSerializationContext {
return IdeaSerializationContext( return IdeaSerializationContext(
logger = extension.project.logger, logger = extension.project.logger,
extrasSerializationExtensions = registeredExtrasSerializationExtensions.toList() extrasSerializationExtensions = registeredExtrasSerializationExtensions.toList()