From b7153d739872e298ba3c4e8869b6d4cfc114c597 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 28 Aug 2013 13:57:56 +0400 Subject: [PATCH] Common methods related to references are pulled up --- .../jet/lang/psi/JetArrayAccessExpression.java | 14 -------------- .../jet/lang/psi/JetCallExpression.java | 16 ---------------- .../jetbrains/jet/lang/psi/JetElementImpl.java | 17 ++++++++++++++++- .../jet/lang/psi/JetNamespaceHeader.java | 13 ------------- .../jet/lang/psi/JetPropertyDelegate.java | 13 ------------- .../jet/lang/psi/JetSimpleNameExpression.java | 14 -------------- .../lang/psi/JetThisReferenceExpression.java | 10 ---------- 7 files changed, 16 insertions(+), 81 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java index 9fc85498edc..dadb8b96415 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java @@ -37,20 +37,6 @@ public class JetArrayAccessExpression extends JetReferenceExpression { super(node); } - @Nullable - @Override - public PsiReference getReference() { - PsiReference[] references = getReferences(); - if (references.length == 1) return references[0]; - else return null; - } - - @NotNull - @Override - public PsiReference[] getReferences() { - return ReferenceProvidersRegistry.getReferencesFromProviders(this, PsiReferenceService.Hints.NO_HINTS); - } - @Override public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitArrayAccessExpression(this); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java index a9caca9cc61..3269e9ff092 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java @@ -18,8 +18,6 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiReference; -import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,20 +32,6 @@ public class JetCallExpression extends JetReferenceExpression implements JetCall super(node); } - @Nullable - @Override - public PsiReference getReference() { - PsiReference[] references = getReferences(); - if (references.length == 1) return references[0]; - else return null; - } - - @NotNull - @Override - public PsiReference[] getReferences() { - return ReferenceProvidersRegistry.getReferencesFromProviders(this); - } - @Override public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitCallExpression(this); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java index c2cd84058aa..ffd1be6fa62 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElementImpl.java @@ -19,8 +19,10 @@ package org.jetbrains.jet.lang.psi; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; +import com.intellij.psi.PsiReference; +import com.intellij.psi.PsiReferenceService; +import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetLanguage; @@ -64,4 +66,17 @@ public class JetElementImpl extends ASTWrapperPsiElement implements JetElement { public R accept(@NotNull JetVisitor visitor, D data) { return visitor.visitJetElement(this, data); } + + @Override + public PsiReference getReference() { + PsiReference[] references = getReferences(); + if (references.length == 1) return references[0]; + else return null; + } + + @NotNull + @Override + public PsiReference[] getReferences() { + return ReferenceProvidersRegistry.getReferencesFromProviders(this, PsiReferenceService.Hints.NO_HINTS); + } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java index 5899803fcb1..3c62fd2f5f5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java @@ -49,19 +49,6 @@ public class JetNamespaceHeader extends JetReferenceExpression { return (JetSimpleNameExpression)findLastChildByType(JetNodeTypes.REFERENCE_EXPRESSION); } - @NotNull - @Override - public PsiReference[] getReferences() { - return ReferenceProvidersRegistry.getReferencesFromProviders(this, PsiReferenceService.Hints.NO_HINTS); - } - - @Nullable - @Override - public PsiReference getReference() { - PsiReference[] references = getReferences(); - return references.length == 1 ? references[0] : null; - } - @Nullable public PsiElement getNameIdentifier() { JetSimpleNameExpression lastPart = (JetSimpleNameExpression)findLastChildByType(JetNodeTypes.REFERENCE_EXPRESSION); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java index dcbe675a49a..a6ab4413239 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java @@ -34,19 +34,6 @@ public class JetPropertyDelegate extends JetElementImpl { return findChildByClass(JetExpression.class); } - @Override - public PsiReference getReference() { - PsiReference[] references = getReferences(); - if (references.length == 1) return references[0]; - return null; - } - - @NotNull - @Override - public PsiReference[] getReferences() { - return ReferenceProvidersRegistry.getReferencesFromProviders(this, PsiReferenceService.Hints.NO_HINTS); - } - @Override public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitPropertyDelegate(this); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java index 52ea770ab9e..e48f84c6920 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java @@ -108,20 +108,6 @@ public class JetSimpleNameExpression extends JetReferenceExpression { return getReferencedNameElement().getNode().getElementType(); } - @NotNull - @Override - public PsiReference[] getReferences() { - return ReferenceProvidersRegistry.getReferencesFromProviders(this, PsiReferenceService.Hints.NO_HINTS); - } - - @Nullable - @Override - public PsiReference getReference() { - PsiReference[] references = getReferences(); - if (references.length == 1) return references[0]; - else return null; - } - @Override public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitSimpleNameExpression(this); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java index cd51109ff22..c98dbd58443 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisReferenceExpression.java @@ -17,20 +17,10 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiReference; -import com.intellij.psi.PsiReferenceService; -import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry; import org.jetbrains.annotations.NotNull; public class JetThisReferenceExpression extends JetReferenceExpression { public JetThisReferenceExpression(@NotNull ASTNode node) { super(node); } - - @NotNull - @Override - public PsiReference[] getReferences() { - return ReferenceProvidersRegistry.getReferencesFromProviders(this, PsiReferenceService.Hints.NO_HINTS); - } - }