From 4392e47210dc9fe783ea1d458c0138df74b8409a Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 28 Mar 2014 16:31:07 +0400 Subject: [PATCH] Use psi methods in JetObjectInfo to determine if object is in fact class object --- .../jet/lang/resolve/lazy/data/JetClassInfoUtil.java | 2 +- .../jet/lang/resolve/lazy/data/JetObjectInfo.java | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java index 212536e9f82..10106e253f1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfoUtil.java @@ -29,7 +29,7 @@ public class JetClassInfoUtil { return new JetClassInfo((JetClass) classOrObject); } if (classOrObject instanceof JetObjectDeclaration) { - return new JetObjectInfo(classOrObject); + return new JetObjectInfo((JetObjectDeclaration) classOrObject); } throw new IllegalArgumentException("Unknown declaration type: " + classOrObject + classOrObject.getText()); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java index ae46b577d54..0d34ed61091 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java @@ -18,23 +18,19 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.psi.JetClassObject; -import org.jetbrains.jet.lang.psi.JetClassOrObject; -import org.jetbrains.jet.lang.psi.JetParameter; -import org.jetbrains.jet.lang.psi.JetTypeParameter; +import org.jetbrains.jet.lang.psi.*; import java.util.Collections; import java.util.List; -public class JetObjectInfo extends JetClassOrObjectInfo { +public class JetObjectInfo extends JetClassOrObjectInfo { @NotNull private final ClassKind kind; - protected JetObjectInfo(@NotNull JetClassOrObject element) { + protected JetObjectInfo(@NotNull JetObjectDeclaration element) { super(element); - boolean isClassObject = element.getParent() instanceof JetClassObject; - this.kind = isClassObject ? ClassKind.CLASS_OBJECT : ClassKind.OBJECT; + this.kind = element.isClassObject() ? ClassKind.CLASS_OBJECT : ClassKind.OBJECT; } @Override