default -> companion: Replace some missed usages of "isDefault"

This commit is contained in:
Pavel V. Talanov
2015-03-17 17:10:00 +03:00
parent 3ec6ffc906
commit a50b218c6a
17 changed files with 25 additions and 25 deletions
@@ -97,7 +97,7 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<KotlinObjectSt
public boolean isCompanion() {
KotlinObjectStub stub = getStub();
if (stub != null) {
return stub.isDefault();
return stub.isCompanion();
}
return getClassKeyword() != null || hasModifier(JetTokens.COMPANION_KEYWORD);
}
@@ -47,7 +47,7 @@ public trait KotlinClassStub : KotlinClassOrObjectStub<JetClass> {
}
public trait KotlinObjectStub : KotlinClassOrObjectStub<JetObjectDeclaration> {
public fun isDefault(): Boolean
public fun isCompanion(): Boolean
public fun isObjectLiteral(): Boolean
}
@@ -56,7 +56,7 @@ public class JetObjectElementType extends JetStubElementType<KotlinObjectStub, J
dataStream.writeName(fqName != null ? fqName.toString() : null);
dataStream.writeBoolean(stub.isTopLevel());
dataStream.writeBoolean(stub.isDefault());
dataStream.writeBoolean(stub.isCompanion());
dataStream.writeBoolean(stub.isLocal());
dataStream.writeBoolean(stub.isObjectLiteral());
@@ -75,7 +75,7 @@ public class JetObjectElementType extends JetStubElementType<KotlinObjectStub, J
FqName fqName = fqNameStr != null ? new FqName(fqNameStr.toString()) : null;
boolean isTopLevel = dataStream.readBoolean();
boolean isDefault = dataStream.readBoolean();
boolean isCompanion = dataStream.readBoolean();
boolean isLocal = dataStream.readBoolean();
boolean isObjectLiteral = dataStream.readBoolean();
@@ -85,7 +85,7 @@ public class JetObjectElementType extends JetStubElementType<KotlinObjectStub, J
superNames[i] = dataStream.readName();
}
return new KotlinObjectStubImpl(parentStub, name, fqName, superNames, isTopLevel, isDefault, isLocal, isObjectLiteral);
return new KotlinObjectStubImpl(parentStub, name, fqName, superNames, isTopLevel, isCompanion, isLocal, isObjectLiteral);
}
@Override
@@ -39,7 +39,7 @@ public class KotlinObjectStubImpl(
override fun getName() = StringRef.toString(name)
override fun getSuperNames() = superNames map { it.toString() }
override fun isTopLevel() = isTopLevel
override fun isDefault() = isDefault
override fun isCompanion() = isDefault
override fun isObjectLiteral() = isObjectLiteral
override fun isLocal() = isLocal
}