From 76e347e5309c7344c8f64b07884215baf6e7c27d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 12 Nov 2013 18:12:56 +0400 Subject: [PATCH] Minor, rename method --- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java | 2 +- .../jet/plugin/intentions/SpecifyTypeExplicitlyAction.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index bb3f2606555..d14e07ad36d 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -230,7 +230,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { //JVMS7: A class must have an EnclosingMethod attribute if and only if it is a local class or an anonymous class. DeclarationDescriptor parentDescriptor = descriptor.getContainingDeclaration(); - boolean isObjectLiteral = DescriptorUtils.isAnonymous(descriptor); + boolean isObjectLiteral = DescriptorUtils.isAnonymousObject(descriptor); boolean isLocalOrAnonymousClass = isObjectLiteral || !(parentDescriptor instanceof NamespaceDescriptor || parentDescriptor instanceof ClassDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 009dc35717b..e38efddf3b5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -1076,7 +1076,7 @@ public class DescriptorResolver { @NotNull BindingTrace trace ) { ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor(); - if (classifierDescriptor == null || !DescriptorUtils.isAnonymous(classifierDescriptor)) { + if (classifierDescriptor == null || !DescriptorUtils.isAnonymousObject(classifierDescriptor)) { return type; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 5a52fc435f6..292d9facb5e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -231,7 +231,7 @@ public class DescriptorUtils { return isKindOf(descriptor, ClassKind.CLASS_OBJECT); } - public static boolean isAnonymous(@NotNull ClassifierDescriptor descriptor) { + public static boolean isAnonymousObject(@NotNull ClassifierDescriptor descriptor) { return isKindOf(descriptor, ClassKind.OBJECT) && descriptor.getName().isSpecial(); } diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java index c5ab00a6792..c936587dc1e 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java @@ -220,7 +220,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { assert !exprType.isError() : "Unexpected error type: " + namedDeclaration.getText(); ClassifierDescriptor descriptor = exprType.getConstructor().getDeclarationDescriptor(); - boolean isAnonymous = descriptor != null && DescriptorUtils.isAnonymous(descriptor); + boolean isAnonymous = descriptor != null && DescriptorUtils.isAnonymousObject(descriptor); Set allSupertypes = TypeUtils.getAllSupertypes(exprType); List types = isAnonymous ? new ArrayList() : Lists.newArrayList(exprType);