From f083c3255915b0aa51c36f00bf7b5ebdb87be2c1 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 31 May 2012 17:30:22 +0400 Subject: [PATCH] Moved common default visitJetElement() into AfterAnalysisHighlightingVisitor from its subclasses. --- .../highlighter/AfterAnalysisHighlightingVisitor.java | 6 ++++++ .../plugin/highlighter/FunctionsHighlightingVisitor.java | 5 ----- .../plugin/highlighter/PropertiesHighlightingVisitor.java | 5 ----- .../plugin/highlighter/VariablesHighlightingVisitor.java | 5 ----- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java index 55399cc865d..798757d40be 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; +import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; abstract class AfterAnalysisHighlightingVisitor extends HighlightingVisitor { @@ -26,4 +27,9 @@ abstract class AfterAnalysisHighlightingVisitor extends HighlightingVisitor { super(holder); this.bindingContext = bindingContext; } + + @Override + public void visitJetElement(JetElement element) { + element.acceptChildren(this); + } } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java index 848bbf52ee7..8b99c477254 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java @@ -32,11 +32,6 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit super(holder, bindingContext); } - @Override - public void visitJetElement(JetElement element) { - element.acceptChildren(this); - } - @Override public void visitNamedFunction(JetNamedFunction function) { PsiElement nameIdentifier = function.getNameIdentifier(); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java index 7249baa1730..cfb66e3cfb0 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java @@ -70,11 +70,6 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { } } - @Override - public void visitJetElement(@NotNull JetElement element) { - element.acceptChildren(this); - } - private void highlightProperty(@NotNull PsiElement elementToHighlight, @NotNull PropertyDescriptor descriptor, boolean withBackingField) { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java index fb2a4e0ae92..cd42f911ad9 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java @@ -32,11 +32,6 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { super(holder, bindingContext); } - @Override - public void visitJetElement(@NotNull JetElement element) { - element.acceptChildren(this); - } - @Override public void visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression) { DeclarationDescriptor target = bindingContext.get(REFERENCE_TARGET, expression);