MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

[javadoc] disallow refs on methods from Object in interfaces (IDEA-224176)

Browse Source 
GitOrigin-RevId: 5e92f739ff1312eb40b003322b3e42ee689501cc
This commit is contained in:
Anna Kozlova
2022-04-07 15:51:25 +02:00
committed by intellij-monorepo-bot
parent 7cdc80c59a
commit b5cafe9cdc
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java
View File

@@ -1,10 +1,11 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.psi.impl.source.javadoc;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.filters.ElementFilter;
import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.PsiSuperMethodImplUtil;
import com.intellij.psi.impl.source.Constants;
@@ -16,7 +17,6 @@ import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.javadoc.PsiDocTag;
import com.intellij.psi.javadoc.PsiDocTagValue;
import com.intellij.psi.scope.DelegatingScopeProcessor;
import com.intellij.psi.scope.ElementClassFilter;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.scope.processor.FilterScopeProcessor;
import com.intellij.psi.util.MethodSignature;
@@ -213,9 +213,26 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
return candidates.toArray(PsiMethod.EMPTY_ARRAY);
}
public static PsiMethod @NotNull [] getAllMethods(PsiElement scope, PsiElement place) {
public static PsiMethod @NotNull [] getAllMethods(PsiClass scope, PsiElement place) {
final SmartList<PsiMethod> result = new SmartList<>();
scope.processDeclarations(new FilterScopeProcessor<>(ElementClassFilter.METHOD, result), ResolveState.initial(), null, place);
scope.processDeclarations(new FilterScopeProcessor<>(new ElementFilter() {
@Override
public boolean isAcceptable(Object element, @Nullable PsiElement context) {
if (element instanceof PsiMethod) {
if (!scope.isInterface()) {
return true;
}
PsiClass containingClass = ((PsiMethod)element).getContainingClass();
return containingClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName());
}
return false;
}
@Override
public boolean isClassAcceptable(Class hintClass) {
return true;
}
}, result), ResolveState.initial(), null, place);
return result.toArray(PsiMethod.EMPTY_ARRAY);
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/LinkToObjectMethods.java Normal file
View File

@@ -0,0 +1,4 @@
/**
* {@link #<error descr="Cannot resolve symbol 'equals'">equals</error>}
*/
interface Foo { }

3
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHighlightingTest.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.codeInsight.daemon;
import com.intellij.JavaTestUtil;
@@ -71,6 +71,7 @@ public class JavadocHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testSee6() { doTest(); }
public void testLinkToItself() { doTest(); }
public void testLinkToMethodNoParams() { doTest(); }
public void testLinkToObjectMethods() { doTest(); }
public void testSeeConstants() { doTest(); }
public void testSeeNonRefs() { doTest(); }
public void testReturn0() { doTest(); }