From ba640e804ad4ab30955833b4398a0e7793d02ca7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 22 Oct 2012 16:17:20 +0200 Subject: [PATCH] Drop support for outdated method receiver syntax --- .../completion/PreferByKindWeigher.java | 10 +- .../analysis/AnnotationsHighlightUtil.java | 2 +- .../psi/impl/light/LightMethodBuilder.java | 5 - .../src/com/intellij/psi/PsiMethod.java | 3 - .../com/intellij/psi/PsiMethodReceiver.java | 7 +- .../lang/java/parser/DeclarationParser.java | 17 +-- .../psi/impl/compiled/ClsMethodImpl.java | 6 +- .../intellij/psi/impl/light/LightMethod.java | 5 - .../psi/impl/source/PsiMethodImpl.java | 8 -- .../impl/source/PsiMethodReceiverImpl.java | 130 ------------------ .../psi/impl/source/tree/JavaElementType.java | 1 - .../source/tree/java/PsiAnnotationImpl.java | 6 +- .../annotation/TypeAnno.java | 2 +- .../annotationParsing/annotation/TypeAnno.txt | 10 -- .../parser-partial/declarations/TypeAnno.txt | 10 -- .../AnnotationParsingTest.java | 14 +- .../parser/partial/DeclarationParserTest.java | 2 +- .../typedef/members/GrMethodBaseImpl.java | 4 - .../impl/synthetic/GrLightMethodBuilder.java | 5 - .../dynamicMembers/GrDynamicMethodImpl.java | 4 - 20 files changed, 18 insertions(+), 233 deletions(-) delete mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java index 1465616183b2..65e988341ead 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,11 +92,9 @@ public class PreferByKindWeigher extends LookupElementWeigher { final PsiAnnotation annotation = PsiTreeUtil.getParentOfType(position, PsiAnnotation.class); assert annotation != null; PsiAnnotationOwner owner = annotation.getOwner(); - if (owner instanceof PsiModifierList || owner instanceof PsiTypeElement || - owner instanceof PsiMethodReceiver || owner instanceof PsiTypeParameter) { - PsiElement member = ((PsiElement)owner).getParent(); - final String[] elementTypeFields = PsiAnnotationImpl - .getApplicableElementTypeFields(owner instanceof PsiModifierList ? member : (PsiElement)owner); + if (owner instanceof PsiModifierList || owner instanceof PsiTypeElement || owner instanceof PsiTypeParameter) { + PsiElement member = owner instanceof PsiModifierList ? ((PsiElement)owner).getParent() : (PsiElement)owner; + final String[] elementTypeFields = PsiAnnotationImpl.getApplicableElementTypeFields(member); return new Condition() { @Override public boolean value(PsiClass psiClass) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java index a3771c7f9261..862f6aa45171 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java @@ -254,7 +254,7 @@ public class AnnotationsHighlightUtil { @Nullable public static HighlightInfo checkApplicability(final PsiAnnotation annotation) { PsiAnnotationOwner owner = annotation.getOwner(); - if (owner instanceof PsiModifierList || owner instanceof PsiTypeElement || owner instanceof PsiMethodReceiver || owner instanceof PsiTypeParameter) { + if (owner instanceof PsiModifierList || owner instanceof PsiTypeElement || owner instanceof PsiTypeParameter) { PsiJavaCodeReferenceElement nameRef = annotation.getNameReferenceElement(); if (nameRef == null) { return null; diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java b/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java index 9d0bab75db87..c9ccfbf7f46f 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java @@ -395,11 +395,6 @@ public class LightMethodBuilder extends LightElement implements PsiMethod, Origi return getContainingFile(); } - @Override - public PsiMethodReceiver getMethodReceiver() { - return null; - } - @Override @Nullable public PsiType getReturnTypeNoResolve() { diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethod.java b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java index 3a065b750773..c547f4a60fb5 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiMethod.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java @@ -207,9 +207,6 @@ public interface PsiMethod extends PsiMember, PsiNameIdentifierOwner, PsiModifie @NotNull HierarchicalMethodSignature getHierarchicalMethodSignature(); - @Nullable - PsiMethodReceiver getMethodReceiver(); - @Nullable PsiType getReturnTypeNoResolve(); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java index 72d5a7694e3f..be9023b7a63c 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,7 @@ */ package com.intellij.psi; -/** - * @author cdr - */ +/** @deprecated obsolete (to remove in IDEA 13) */ +@SuppressWarnings("UnusedDeclaration") public interface PsiMethodReceiver extends PsiAnnotationOwner, PsiParameter { } diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java index 479134ed8906..8722c92feb8e 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java @@ -333,7 +333,7 @@ public class DeclarationParser { } if (!expect(builder, JavaTokenType.IDENTIFIER)) { - if ((context == Context.CODE_BLOCK) && modListInfo.second) { + if ((context == Context.CODE_BLOCK) && Boolean.TRUE.equals(modListInfo.second)) { declaration.rollbackTo(); return null; } @@ -408,17 +408,6 @@ public class DeclarationParser { eatBrackets(builder, constructor, "expected.semicolon"); - if (builder.getTokenType() == JavaTokenType.AT) { - final PsiBuilder.Marker receiver = builder.mark(); - final PsiBuilder.Marker annotations = parseAnnotations(builder); - if (annotations != null) { - done(receiver, JavaElementType.METHOD_RECEIVER); - } - else { - receiver.drop(); - } - } - myParser.getReferenceParser().parseReferenceList(builder, JavaTokenType.THROWS_KEYWORD, JavaElementType.THROWS_LIST, JavaTokenType.COMMA); final boolean hasDefault = expect(builder, JavaTokenType.DEFAULT_KEYWORD); @@ -565,8 +554,6 @@ public class DeclarationParser { } } - // todo: false positive - //noinspection ConstantConditions if (invalidElements != null) { invalidElements.error(errorMessage); } @@ -608,7 +595,7 @@ public class DeclarationParser { typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, flags); if (typeInfo == null) { - if (modListInfo.second) { + if (Boolean.TRUE.equals(modListInfo.second)) { param.rollbackTo(); return null; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java index 647197a9a686..2f03ef0da423 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java @@ -432,10 +432,7 @@ public class ClsMethodImpl extends ClsRepositoryPsiElement implem public SearchScope getUseScope() { return PsiImplUtil.getMemberUseScope(this); } - @Override - public PsiMethodReceiver getMethodReceiver() { - return null; //todo parse cls - } + @Override public PsiType getReturnTypeNoResolve() { return getReturnType(); @@ -445,5 +442,4 @@ public class ClsMethodImpl extends ClsRepositoryPsiElement implem protected boolean isVisibilitySupported() { return true; } - } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java index be7a77656a40..0b5fca4a4c80 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java @@ -256,11 +256,6 @@ public class LightMethod extends LightElement implements PsiMethod { return getContainingClass(); } - @Override - public PsiMethodReceiver getMethodReceiver() { - return null; - } - @Override public PsiType getReturnTypeNoResolve() { return getReturnType(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java index 3297ea76299d..f67e3e9b11f5 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java @@ -32,7 +32,6 @@ import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; import com.intellij.psi.impl.java.stubs.PsiMethodStub; import com.intellij.psi.impl.source.tree.ChildRole; import com.intellij.psi.impl.source.tree.CompositeElement; -import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.impl.source.tree.JavaSharedImplUtil; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.scope.PsiScopeProcessor; @@ -159,13 +158,6 @@ public class PsiMethodImpl extends JavaStubPsiElement implements return PsiSuperMethodImplUtil.getHierarchicalMethodSignature(this); } - @Override - public PsiMethodReceiver getMethodReceiver() { - ASTNode node = getNode().findChildByType(JavaElementType.METHOD_RECEIVER); - if (node == null) return null; - return (PsiMethodReceiver)node.getPsi(); - } - @Override public PsiElement setName(@NotNull String name) throws IncorrectOperationException{ PsiImplUtil.setName(getNameIdentifier(), name); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java deleted file mode 100644 index af79860a43a7..000000000000 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.psi.impl.source; - -import com.intellij.psi.*; -import com.intellij.psi.impl.source.tree.CompositePsiElement; -import com.intellij.psi.impl.source.tree.ElementType; -import com.intellij.psi.impl.source.tree.JavaElementType; -import com.intellij.psi.impl.PsiImplUtil; -import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; - -/** - * @author cdr - */ -public class PsiMethodReceiverImpl extends CompositePsiElement implements PsiMethodReceiver { - public PsiMethodReceiverImpl() { - super(JavaElementType.METHOD_RECEIVER); - } - - @Override - @NotNull - public PsiElement getDeclarationScope() { - return getParent(); - } - - @Override - public boolean isVarArgs() { - return false; - } - - @Override - @NotNull - public PsiAnnotation[] getAnnotations() { - return getChildrenAsPsiElements(ElementType.ANNOTATIONS, PsiAnnotation.ARRAY_FACTORY); - } - - @Override - public PsiAnnotation findAnnotation(@NotNull @NonNls String qualifiedName) { - return PsiImplUtil.findAnnotation(this, qualifiedName); - } - - @Override - @NotNull - public PsiAnnotation addAnnotation(@NotNull @NonNls String qualifiedName) { - throw new IncorrectOperationException(); - } - - - @Override - @NotNull - public PsiType getType() { - return JavaPsiFacade.getElementFactory(getProject()).createType(((PsiMethod)getParent()).getContainingClass()); - } - - @Override - public PsiTypeElement getTypeElement() { - return null; - } - - @Override - public PsiExpression getInitializer() { - return null; - } - - @Override - public boolean hasInitializer() { - return false; - } - - @Override - public void normalizeDeclaration() throws IncorrectOperationException { - - } - - @Override - public Object computeConstantValue() { - return null; - } - - @Override - public PsiIdentifier getNameIdentifier() { - return null; - } - - @Override - public String getName() { - return "this"; - } - - @Override - public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException { - throw new IncorrectOperationException(); - } - - @Override - public PsiModifierList getModifierList() { - return null; - } - - @Override - public boolean hasModifierProperty(@NonNls @NotNull String name) { - return false; - } - - @Override - @NotNull - public PsiAnnotation[] getApplicableAnnotations() { - return getAnnotations(); - } - - @Override - public PsiType getTypeNoResolve() { - return getType(); - } -} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java index 9374cccffb7f..a24e5f5f8b05 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java @@ -133,7 +133,6 @@ public interface JavaElementType { IElementType LABELED_STATEMENT = new JavaCompositeElementType("LABELED_STATEMENT", PsiLabeledStatementImpl.class); IElementType ASSERT_STATEMENT = new JavaCompositeElementType("ASSERT_STATEMENT", PsiAssertStatementImpl.class); IElementType ANNOTATION_ARRAY_INITIALIZER = new JavaCompositeElementType("ANNOTATION_ARRAY_INITIALIZER", PsiArrayInitializerMemberValueImpl.class); - IElementType METHOD_RECEIVER = new JavaCompositeElementType("METHOD_RECEIVER", PsiMethodReceiverImpl.class); class ICodeBlockElementType extends IErrorCounterReparseableElementType implements ICompositeElementType, ILightLazyParseableElementType { private ICodeBlockElementType() { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java index 72b4a95b2782..9a2d8f0dbd09 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,7 +123,9 @@ public class PsiAnnotationImpl extends JavaStubPsiElement imp if (parent instanceof PsiTypeElement) { return ((PsiTypeElement)parent).getOwner(this); } - if (parent instanceof PsiMethodReceiver || parent instanceof PsiTypeParameter) return (PsiAnnotationOwner)parent; + if (parent instanceof PsiTypeParameter) { + return (PsiAnnotationOwner)parent; + } PsiElement member = parent.getParent(); String[] elementTypeFields = getApplicableElementTypeFields(member); if (elementTypeFields == null) return null; diff --git a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.java b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.java index 857528c788e9..7bd7bf628353 100644 --- a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.java +++ b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.java @@ -1,5 +1,5 @@ class C<@D T extends @F Object> extends @F Object { - @F int @F[] methodf() @F throws @F Exception { + @F int @F[] methodf() throws @F Exception { a = this instanceof @F C; C<@F @G C> c = new @Q C<@F C>(); c = (@F Object)c; diff --git a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.txt b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.txt index c17ee45401d6..b16a03aed39a 100644 --- a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.txt +++ b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnno.txt @@ -93,16 +93,6 @@ PsiJavaFile:TypeAnno.java PsiJavaToken:LPARENTH('(') PsiJavaToken:RPARENTH(')') PsiWhiteSpace(' ') - PsiElement(METHOD_RECEIVER) - PsiAnnotation - PsiJavaToken:AT('@') - PsiJavaCodeReferenceElement:F - PsiIdentifier:F('F') - PsiReferenceParameterList - - PsiAnnotationParameterList - - PsiWhiteSpace(' ') PsiReferenceList PsiKeyword:throws('throws') PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/declarations/TypeAnno.txt b/java/java-tests/testData/psi/parser-partial/declarations/TypeAnno.txt index 72944a003f34..b44cea753f5f 100644 --- a/java/java-tests/testData/psi/parser-partial/declarations/TypeAnno.txt +++ b/java/java-tests/testData/psi/parser-partial/declarations/TypeAnno.txt @@ -93,16 +93,6 @@ PsiJavaFile:TypeAnno.java PsiJavaToken:LPARENTH('(') PsiJavaToken:RPARENTH(')') PsiWhiteSpace(' ') - PsiElement(METHOD_RECEIVER) - PsiAnnotation - PsiJavaToken:AT('@') - PsiJavaCodeReferenceElement:F - PsiIdentifier:F('F') - PsiReferenceParameterList - - PsiAnnotationParameterList - - PsiWhiteSpace(' ') PsiReferenceList PsiKeyword:throws('throws') PsiWhiteSpace(' ') diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/annotationParsing/AnnotationParsingTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/annotationParsing/AnnotationParsingTest.java index b665ba027bea..3a246821cb83 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/annotationParsing/AnnotationParsingTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/annotationParsing/AnnotationParsingTest.java @@ -16,8 +16,6 @@ package com.intellij.lang.java.parser.annotationParsing; import com.intellij.lang.java.parser.JavaParsingTestCase; -import com.intellij.psi.PsiErrorElement; -import com.intellij.psi.PsiRecursiveElementVisitor; /** * @author ven @@ -40,15 +38,5 @@ public class AnnotationParsingTest extends JavaParsingTestCase { public void testQualifiedAnnotation() { doTest(true); } public void testEnumSmartTypeCompletion() { doTest(true); } public void testErrors() { doTest(true); } - - public void testTypeAnno() { - doTest(true); - myFile.accept(new PsiRecursiveElementVisitor() { - @Override - public void visitErrorElement(PsiErrorElement element) { - fail(element.getErrorDescription()); - super.visitErrorElement(element); - } - }); - } + public void testTypeAnno() { doTest(true); } } diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java index fd828852377a..39ac250cd2ba 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java @@ -40,7 +40,7 @@ public class DeclarationParserTest extends JavaParsingTestCase { " @Preliminary(a=A.B\n#, b=c) public class TimeTravel {} }", false, false); } public void testTypeAnno() { doParserTest("{ class C<@D T extends @F Object> extends @F Object {\n" + - " @F int @F[] method() @F throws @F Exception {\n" + + " @F int @F[] method() throws @F Exception {\n" + " a = this instanceof @F C;\n" + " C<@F @G C> c = new @Q C<@F C>();\n" + " c = (@F Object)c;\n" + diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java index 2364812bf137..728c1b491c45 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java @@ -528,10 +528,6 @@ public abstract class GrMethodBaseImpl extends GrStubElementBase i return visitor.getResult(); } - public PsiMethodReceiver getMethodReceiver() { - return null; - } - public PsiType getReturnTypeNoResolve() { if (isConstructor()) return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java index 4030388d5429..7827a5e5fb53 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java @@ -439,11 +439,6 @@ public class GrLightMethodBuilder extends LightElement implements GrMethod, Ori return getContainingFile(); } - @Override - public PsiMethodReceiver getMethodReceiver() { - return null; - } - @Override public PsiType getReturnTypeNoResolve() { return getReturnType(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java index 6447d46c7613..611414848e29 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java @@ -227,10 +227,6 @@ public class GrDynamicMethodImpl extends LightElement implements GrMethod { return myMethod.getHierarchicalMethodSignature(); } - public PsiMethodReceiver getMethodReceiver() { - return null; - } - public PsiType getReturnTypeNoResolve() { return myMethod.getReturnTypeNoResolve(); }