From 99b922e582f31a4ef12a0edddf1e5aea88aeaf1d Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 2 Apr 2012 17:27:58 +0400
Subject: [PATCH] Made proper highlighting for variables invoked as functions.

---
 .../highlighter/FunctionsHighlightingVisitor.java      |  7 ++-----
 .../highlighter/PropertiesHighlightingVisitor.java     |  8 ++++----
 .../highlighter/VariablesHighlightingVisitor.java      | 10 ++++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
index 6cb32e4a138..0fd08a965a0 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
@@ -18,10 +18,7 @@ package org.jetbrains.jet.plugin.highlighter;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.psi.PsiElement;
-import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
@@ -78,7 +75,7 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
                     holder.createInfoAnnotation(callee, null).setTextAttributes(
                         JetHighlightingColors.CONSTRUCTOR_CALL);
                 }
-                else if (calleeDescriptor instanceof FunctionDescriptor) {
+                else if (calleeDescriptor instanceof FunctionDescriptor && !(calleeDescriptor instanceof VariableAsFunctionDescriptor)) {
                     FunctionDescriptor fun = (FunctionDescriptor)calleeDescriptor;
                     if (fun.getReceiverParameter() != ReceiverDescriptor.NO_RECEIVER) {
                         holder.createInfoAnnotation(callee, null).setTextAttributes(
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
index f12ed88d807..f5ef640253e 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.highlighter;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
-import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
+import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
@@ -36,6 +33,9 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
     @Override
     public void visitSimpleNameExpression(JetSimpleNameExpression expression) {
         DeclarationDescriptor target = bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
+        if (target instanceof VariableAsFunctionDescriptor) {
+            target = ((VariableAsFunctionDescriptor)target).getVariableDescriptor();
+        }
         if (!(target instanceof PropertyDescriptor)) {
             return;
         }
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
index 34ca797f29c..74cd97b6b91 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.highlighter;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.LocalVariableDescriptor;
-import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
+import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetType;
@@ -88,6 +85,11 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
     }
 
     private void highlightVariable(@NotNull PsiElement elementToHighlight, @NotNull DeclarationDescriptor descriptor) {
+        if (descriptor instanceof VariableAsFunctionDescriptor) {
+            descriptor = ((VariableAsFunctionDescriptor)descriptor).getVariableDescriptor();
+            //noinspection ConstantConditions
+            if (descriptor == null) return;
+        }
         if (descriptor instanceof VariableDescriptor) {
             VariableDescriptor variableDescriptor = (VariableDescriptor) descriptor;
             if (variableDescriptor.isVar()) {