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

rename Kt to Kotlin in KtType, KtIcons

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-20 16:23:25 +02:00
parent 9d7a8e7696
commit d6a3870101
457 changed files with 2831 additions and 2830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+6 -6
View File
@@ -139,7 +139,7 @@ public class DescriptorSerializer {
if (!KotlinBuiltIns.isSpecialClassWithNoSupertypes(classDescriptor)) {
// Special classes (Any, Nothing) have no supertypes
for (KtType supertype : classDescriptor.getTypeConstructor().getSupertypes()) {
for (KotlinType supertype : classDescriptor.getTypeConstructor().getSupertypes()) {
if (useTypeTable()) {
builder.addSupertypeId(typeId(supertype));
}
@@ -382,7 +382,7 @@ public class DescriptorSerializer {
builder.setType(type(descriptor.getType()));
}
KtType varargElementType = descriptor.getVarargElementType();
KotlinType varargElementType = descriptor.getVarargElementType();
if (varargElementType != null) {
if (useTypeTable()) {
builder.setVarargElementTypeId(typeId(varargElementType));
@@ -414,10 +414,10 @@ public class DescriptorSerializer {
}
extension.serializeTypeParameter(typeParameter, builder);
Set<KtType> upperBounds = typeParameter.getUpperBounds();
Set<KotlinType> upperBounds = typeParameter.getUpperBounds();
if (upperBounds.size() == 1 && KotlinBuiltIns.isDefaultBound(CollectionsKt.single(upperBounds))) return builder;
for (KtType upperBound : upperBounds) {
for (KotlinType upperBound : upperBounds) {
if (useTypeTable()) {
builder.addUpperBoundId(typeId(upperBound));
}
@@ -441,12 +441,12 @@ public class DescriptorSerializer {
throw new IllegalStateException("Unknown variance: " + variance);
}
private int typeId(@NotNull KtType type) {
private int typeId(@NotNull KotlinType type) {
return typeTable.get(type(type));
}
@NotNull
private ProtoBuf.Type.Builder type(@NotNull KtType type) {
private ProtoBuf.Type.Builder type(@NotNull KotlinType type) {
assert !type.isError() : "Can't serialize error types: " + type; // TODO
if (FlexibleTypesKt.isFlexible(type)) {
compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.types.KtType;
import org.jetbrains.kotlin.types.KotlinType;
import java.util.Collection;
@@ -48,7 +48,7 @@ public abstract class SerializerExtension {
public void serializeValueParameter(@NotNull ValueParameterDescriptor descriptor, @NotNull ProtoBuf.ValueParameter.Builder proto) {
}
public void serializeType(@NotNull KtType type, @NotNull ProtoBuf.Type.Builder proto) {
public void serializeType(@NotNull KotlinType type, @NotNull ProtoBuf.Type.Builder proto) {
}
public void serializeTypeParameter(@NotNull TypeParameterDescriptor typeParameter, @NotNull ProtoBuf.TypeParameter.Builder proto) {