From aa28a03f61d6fb9061cbb7dea84de435b535e234 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 19 Oct 2012 15:29:31 +0400
Subject: [PATCH] Mark deprecated items in ProjectView (class, function,
 property, class-object)  #KT-2944 Fixed Mark deprecated classes in Project
 Tree

---
 .../jetbrains/jet/lang/psi/JetPsiUtil.java    | 29 +++++++++++++++++++
 .../elements/JetAnnotationElementType.java    | 16 +++-------
 .../projectView/JetClassObjectTreeNode.java   |  6 ++++
 .../projectView/JetClassOrObjectTreeNode.java |  6 ++++
 .../projectView/JetDeclarationTreeNode.java   |  5 ++++
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index d1a67912f5f..07d555b5daa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -185,6 +185,35 @@ public class JetPsiUtil {
         return firstPart.child(name);
     }
 
+    @Nullable
+    public static Name getShortName(JetAnnotationEntry annotation) {
+        JetTypeReference typeReference = annotation.getTypeReference();
+        assert typeReference != null : "Annotation entry hasn't typeReference " + annotation.getText();
+        JetTypeElement typeElement = typeReference.getTypeElement();
+        if (typeElement instanceof JetUserType) {
+            JetUserType userType = (JetUserType) typeElement;
+            String shortName = userType.getReferencedName();
+            if (shortName != null) {
+                return Name.identifier(shortName);
+            }
+        }
+        return null;
+    }
+
+    public static boolean isDeprecated(JetModifierListOwner owner) {
+        JetModifierList modifierList = owner.getModifierList();
+        if (modifierList != null) {
+            List<JetAnnotationEntry> annotationEntries = modifierList.getAnnotationEntries();
+            for (JetAnnotationEntry annotation : annotationEntries) {
+                Name shortName = getShortName(annotation);
+                if (KotlinBuiltIns.getInstance().getDeprecatedAnnotation().getName().equals(shortName)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     @Nullable @IfNotParsed
     public static ImportPath getImportPath(JetImportDirective importDirective) {
         final JetExpression importedReference = importDirective.getImportedReference();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationElementType.java
index 34a2ef316c4..8b173109bd0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetAnnotationElementType.java
@@ -27,6 +27,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetAnnotationStub;
 import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetAnnotationStubImpl;
+import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.io.IOException;
 
@@ -48,18 +49,9 @@ public class JetAnnotationElementType extends JetStubElementType<PsiJetAnnotatio
 
     @Override
     public PsiJetAnnotationStub createStub(@NotNull JetAnnotationEntry psi, StubElement parentStub) {
-        JetTypeReference typeReference = psi.getTypeReference();
-        assert typeReference != null : "Annotation entry hasn't typeReference " + psi.getText();
-        JetTypeElement typeElement = typeReference.getTypeElement();
-        String shortName = null;
-        if (typeElement instanceof JetUserType) {
-            JetUserType userType = (JetUserType) typeElement;
-            shortName = userType.getReferencedName();
-        }
-        if (shortName == null) {
-            shortName = psi.getText();
-        }
-        return new PsiJetAnnotationStubImpl(parentStub, JetStubElementTypes.ANNOTATION_ENTRY, shortName);
+        Name shortName = JetPsiUtil.getShortName(psi);
+        String resultName = shortName != null ? shortName.getName() : psi.getText();
+        return new PsiJetAnnotationStubImpl(parentStub, JetStubElementTypes.ANNOTATION_ENTRY, resultName);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
index 84662a3a6d1..0a106cda93c 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
@@ -23,6 +23,7 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.jet.lang.psi.JetClassObject;
+import org.jetbrains.jet.lang.psi.JetPsiUtil;
 
 import java.util.Collection;
 
@@ -60,4 +61,9 @@ public class JetClassObjectTreeNode extends AbstractPsiBasedNode<JetClassObject>
 
         return super.canRepresent(element) || canRepresentPsiElement(getValue(), element, getSettings());
     }
+
+    @Override
+    protected boolean isDeprecated() {
+        return JetPsiUtil.isDeprecated(getValue());
+    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
index 5a896c19430..959454b8de4 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.plugin.JetIconProvider;
 
 import java.util.Collection;
@@ -75,6 +76,11 @@ public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<JetClassOrObj
         }
     }
 
+    @Override
+    protected boolean isDeprecated() {
+        return JetPsiUtil.isDeprecated(getValue());
+    }
+
     @Override
     public boolean canRepresent(Object element) {
         if (!isValid()) {
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
index bc94604e464..2ad50d47fa2 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
@@ -105,4 +105,9 @@ public class JetDeclarationTreeNode extends AbstractPsiBasedNode<JetDeclaration>
             data.setPresentableText(text);
         }
     }
+
+    @Override
+    protected boolean isDeprecated() {
+        return JetPsiUtil.isDeprecated(getValue());
+    }
 }