From c11f1807bcc8fcc177d2726ea86a6e31ce8953c5 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 28 Jul 2015 16:17:31 +0300 Subject: [PATCH] Rename: ClassKind.TRAIT -> ClassKind.INTERFACE --- .../createFromUsage/callableBuilder/CallableBuilder.kt | 2 +- .../createClass/CreateClassFromTypeReferenceActionFactory.kt | 4 ++-- .../createFromUsage/createClass/CreateClassFromUsageFix.kt | 4 ++-- .../quickfix/createFromUsage/createClass/createClassUtils.kt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 1ddce6ccdd0..cafa4c78ff5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -487,7 +487,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { val openMod = if (open) "open " else "" val innerMod = if (inner) "inner " else "" val typeParamList = when (kind) { - ClassKind.PLAIN_CLASS, ClassKind.TRAIT -> "<>" + ClassKind.PLAIN_CLASS, ClassKind.INTERFACE -> "<>" else -> "" } psiFactory.createDeclaration( diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt index 484bad63543..e5df7797ebf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt @@ -38,12 +38,12 @@ public object CreateClassFromTypeReferenceActionFactory : CreateClassFromUsageFa val typeRefParent = element.parent?.parent if (typeRefParent is JetConstructorCalleeExpression) return Collections.emptyList() - val traitExpected = typeRefParent is JetDelegatorToSuperClass + val interfaceExpected = typeRefParent is JetDelegatorToSuperClass val isQualifier = (element.parent as? JetUserType)?.let { it.qualifier == element } ?: false return when { - traitExpected -> Collections.singletonList(ClassKind.TRAIT) + interfaceExpected -> Collections.singletonList(ClassKind.INTERFACE) else -> ClassKind.values().filter { val noTypeArguments = element.typeArgumentsAsTypes.isEmpty() when (it) { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index d90cebe3cf8..60c1875330b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt @@ -43,7 +43,7 @@ enum class ClassKind(val keyword: String, val description: String) { ENUM_CLASS("enum class", "enum"), ENUM_ENTRY("", "enum constant"), ANNOTATION_CLASS("annotation class", "annotation"), - TRAIT("interface", "interface"), + INTERFACE("interface", "interface"), OBJECT("object", "object"), DEFAULT("", "") // Used as a placeholder and must be replaced with one of the kinds above } @@ -119,7 +119,7 @@ public class CreateClassFromUsageFix( val constructorInfo = PrimaryConstructorInfo(classInfo, expectedTypeInfo) val builder = CallableBuilderConfiguration( - Collections.singletonList(constructorInfo), element as JetElement, file, editor, false, kind == PLAIN_CLASS || kind == TRAIT + Collections.singletonList(constructorInfo), element as JetElement, file, editor, false, kind == PLAIN_CLASS || kind == INTERFACE ).createBuilder() builder.placement = CallablePlacement.NoReceiver(targetParent) project.executeCommand(text) { builder.build() } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt index 4b8e0c8d909..4a791e551a2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt @@ -106,8 +106,8 @@ private fun JetExpression.getInheritableTypeInfo( return TypeInfo.ByType(type, Variance.OUT_VARIANCE).noSubstitutions() to { classKind -> when (classKind) { ClassKind.ENUM_ENTRY -> isEnum && containingDeclaration == DescriptorToSourceUtils.descriptorToDeclaration(descriptor) - ClassKind.TRAIT -> containingDeclaration !is PsiClass - || (descriptor as? ClassDescriptor)?.getKind() == ClassDescriptorKind.INTERFACE + ClassKind.INTERFACE -> containingDeclaration !is PsiClass + || (descriptor as? ClassDescriptor)?.getKind() == ClassDescriptorKind.INTERFACE else -> canHaveSubtypes } }