From 5ad571c5ab72d4e56aa7b6142cb4ad6e1d44e562 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 12 Mar 2013 19:30:46 +0400
Subject: [PATCH] Inlined method which was used only once, and in different
 subsystem.

---
 .../jet/plugin/completion/JetTypesCompletionHelper.java      | 5 +++--
 .../jet/plugin/libraries/DecompiledDataFactory.java          | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java b/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java
index 864750e6908..0a1bc7b9339 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java
@@ -25,12 +25,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.asJava.KotlinLightClass;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
+import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
+import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.caches.JetShortNamesCache;
 import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector;
-import org.jetbrains.jet.plugin.libraries.DecompiledDataFactory;
 
 public class JetTypesCompletionHelper {
     private JetTypesCompletionHelper() {}
@@ -89,7 +90,7 @@ public class JetTypesCompletionHelper {
         }
 
         if (DescriptorResolverUtils.isKotlinClass(aClass)) {
-            if (!DecompiledDataFactory.isKotlinObject(aClass)) {
+            if (JetClassAnnotation.get(aClass).kind() != JvmStdlibNames.FLAG_CLASS_KIND_OBJECT) {
                 String qualifiedName = aClass.getQualifiedName();
                 if (qualifiedName != null) {
                     FqName fqName = new FqName(qualifiedName);
diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
index 8e39edd3456..65949436084 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
@@ -210,8 +210,4 @@ public class DecompiledDataFactory {
         }
         return false;
     }
-
-    public static boolean isKotlinObject(PsiClass aClass) {
-        return JetClassAnnotation.get(aClass).kind() == JvmStdlibNames.FLAG_CLASS_KIND_OBJECT;
-    }
 }