From 15add4bd64c0c04e260cdfa193d9d54ca4fe4706 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 18 Dec 2014 19:52:33 +0300
Subject: [PATCH] Remove no longer meaningful utils from JavaResolverUtils

---
 .../lang/resolve/java/JavaResolverUtils.java  | 19 -----------------
 .../jet/plugin/JetDescriptorIconProvider.java | 21 +------------------
 .../plugin/completion/LookupElementFactory.kt |  3 +--
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java
index a1ab9bb6384..12e5c21e198 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.lang.resolve.java;
 
-import com.intellij.psi.PsiClass;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
@@ -24,7 +23,6 @@ import org.jetbrains.jet.lang.descriptors.SourceElement;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.java.structure.*;
-import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl;
 import org.jetbrains.jet.lang.types.TypeConstructor;
 import org.jetbrains.jet.lang.types.TypeProjection;
 import org.jetbrains.jet.lang.types.TypeProjectionImpl;
@@ -32,27 +30,10 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor;
 
 import java.util.*;
 
-import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS;
-import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE;
-
 public class JavaResolverUtils {
     private JavaResolverUtils() {
     }
 
-    public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) {
-        JavaClass javaClass = new JavaClassImpl(psiClass);
-        return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_CLASS) != null;
-    }
-
-    public static boolean isCompiledKotlinPackageClass(@NotNull PsiClass psiClass) {
-        JavaClass javaClass = new JavaClassImpl(psiClass);
-        return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_PACKAGE) != null;
-    }
-
-    public static boolean isCompiledKotlinClassOrPackageClass(@NotNull PsiClass psiClass) {
-        return isCompiledKotlinClass(psiClass) || isCompiledKotlinPackageClass(psiClass);
-    }
-
     /**
      * @see com.intellij.psi.util.TypeConversionUtil#erasure(com.intellij.psi.PsiType)
      */
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
index ffe09d693de..0a4fb563392 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
@@ -18,9 +18,7 @@ package org.jetbrains.jet.plugin;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Iconable;
-import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiMember;
 import com.intellij.ui.RowIcon;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
@@ -28,7 +26,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
 import org.jetbrains.jet.lang.psi.JetElement;
-import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils;
 
 import javax.swing.*;
 
@@ -41,7 +38,7 @@ public final class JetDescriptorIconProvider {
 
     @NotNull
     public static Icon getIcon(@NotNull DeclarationDescriptor descriptor, @Nullable PsiElement declaration, @Iconable.IconFlags int flags) {
-        if (declaration != null && !isKotlinDeclaration(declaration)) {
+        if (declaration != null && !(declaration instanceof JetElement)) {
             return declaration.getIcon(flags);
         }
 
@@ -142,20 +139,4 @@ public final class JetDescriptorIconProvider {
         LOG.warn("No icon for descriptor: " + descriptor);
         return null;
     }
-
-    private static boolean isKotlinDeclaration(@NotNull PsiElement declaration) {
-        if (declaration instanceof JetElement) {
-            return true;
-        }
-        else if (declaration instanceof PsiClass) {
-            return JavaResolverUtils.isCompiledKotlinClassOrPackageClass((PsiClass) declaration);
-        }
-        else if (declaration instanceof PsiMember) {
-            PsiClass containingClass = ((PsiMember) declaration).getContainingClass();
-            return containingClass != null && JavaResolverUtils.isCompiledKotlinClassOrPackageClass(containingClass);
-        }
-        else {
-            return false;
-        }
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt
index 84723391402..0ec20221ff5 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt
@@ -135,8 +135,7 @@ public class LookupElementFactory(
     ): LookupElement {
         if (descriptor is ClassifierDescriptor &&
             declaration is PsiClass &&
-            declaration !is KotlinLightClass &&
-            !JavaResolverUtils.isCompiledKotlinClass(declaration)) {
+            declaration !is KotlinLightClass) {
             // for java classes we create special lookup elements
             // because they must be equal to ones created in TypesCompletion
             // otherwise we may have duplicates