From 6f3ea01084b53cc69dc4de5d9f0f471975fdd821 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 5 May 2016 20:35:13 +0300 Subject: [PATCH] Refactoring: rename ClassBuilderMode entry LIGHT_CLASSES_WITH_METADATA->KAPT --- .../src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java | 2 +- .../src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java | 2 +- .../src/org/jetbrains/kotlin/codegen/classBuilderModeUtil.kt | 2 +- .../kotlin/codegen/serialization/JvmSerializerExtension.java | 2 +- .../org/jetbrains/kotlin/annotation/StubProducerExtension.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index 14dbdd91141..0a9efcae3bf 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -404,7 +404,7 @@ public abstract class AnnotationCodegen { case FULL: throw new IllegalStateException("Don't know how to compile annotation value " + value); case LIGHT_CLASSES: - case LIGHT_CLASSES_WITH_METADATA: + case KAPT: return null; default: throw new IllegalStateException("Unknown builder mode: " + mode); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java index 08077bd1f9a..557f7bb086a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java @@ -28,5 +28,5 @@ public enum ClassBuilderMode { /** * Function signatures + metadata (to support incremental compilation with kapt) */ - LIGHT_CLASSES_WITH_METADATA; + KAPT; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/classBuilderModeUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/classBuilderModeUtil.kt index b86afa3e5d5..5675a09fa81 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/classBuilderModeUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/classBuilderModeUtil.kt @@ -17,4 +17,4 @@ package org.jetbrains.kotlin.codegen fun ClassBuilderMode.shouldGenerateMetadata() = - this == ClassBuilderMode.FULL || this == ClassBuilderMode.LIGHT_CLASSES_WITH_METADATA \ No newline at end of file + this == ClassBuilderMode.FULL || this == ClassBuilderMode.KAPT \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java index c29e45031f8..aebc29d358c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java @@ -149,7 +149,7 @@ public class JvmSerializerExtension extends SerializerExtension { @Override public void serializeErrorType(@NotNull KotlinType type, @NotNull ProtoBuf.Type.Builder builder) { - if (classBuilderMode == ClassBuilderMode.LIGHT_CLASSES_WITH_METADATA) { + if (classBuilderMode == ClassBuilderMode.KAPT) { builder.setClassName(stringTable.getStringIndex("error.NonExistingClass")); return; } diff --git a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt index 9cc872e6674..2fb905fe24c 100644 --- a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt +++ b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt @@ -59,7 +59,7 @@ class StubProducerExtension(val stubsOutputDir: File, val messageCollector: Mess private class StubClassBuilderFactory : ClassBuilderFactory { - override fun getClassBuilderMode() = ClassBuilderMode.LIGHT_CLASSES_WITH_METADATA + override fun getClassBuilderMode() = ClassBuilderMode.KAPT override fun newClassBuilder(origin: JvmDeclarationOrigin) = AbstractClassBuilder.Concrete( ClassWriter(ClassWriter.COMPUTE_FRAMES or ClassWriter.COMPUTE_MAXS))