MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-216256 Provide fixes for receiver cannot be used in a static context

Browse Source 
GitOrigin-RevId: f80081974933f296ec2b3ac94a0b85891afcb58c
This commit is contained in:
Andrey.Cherkasov
2021-02-15 15:07:49 +03:00
committed by intellij-monorepo-bot
parent 5e63bd63c9
commit 4ca740f0e6
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
View File

@@ -1,9 +1,10 @@
// 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-2021 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.
package com.intellij.codeInsight.daemon.impl.analysis;
import com.intellij.codeInsight.AnnotationTargetUtil;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.daemon.JavaErrorBundle;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.codeInsight.daemon.impl.quickfix.MoveAnnotationOnStaticMemberQualifyingTypeFix;
@@ -45,6 +46,8 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
public final class AnnotationsHighlightUtil {
private static final Logger LOG = Logger.getInstance(AnnotationsHighlightUtil.class);
private static final QuickFixFactory QUICK_FIX_FACTORY = QuickFixFactory.getInstance();
static HighlightInfo checkNameValuePair(@NotNull PsiNameValuePair pair,
@Nullable RefCountHolder refCountHolder) {
PsiAnnotation annotation = PsiTreeUtil.getParentOfType(pair, PsiAnnotation.class);
@@ -697,7 +700,16 @@ public final class AnnotationsHighlightUtil {
PsiMethod method = (PsiMethod)owner;
if (isStatic(method) || method.isConstructor() && isStatic(method.getContainingClass())) {
String text = JavaErrorBundle.message("receiver.static.context");
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(parameter.getIdentifier()).descriptionAndTooltip(text).create();
HighlightInfo info =
HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(parameter.getIdentifier()).descriptionAndTooltip(text).create();
QuickFixAction.registerQuickFixAction(
info,
QUICK_FIX_FACTORY.createModifierListFix(method.getModifierList(), PsiModifier.STATIC, false, false)
);
QuickFixAction.registerQuickFixAction(
info,
QUICK_FIX_FACTORY.createDeleteFix(parameter, QuickFixBundle.message("remove.receiver.parameter")));
return info;
}
PsiElement leftNeighbour = PsiTreeUtil.skipWhitespacesAndCommentsBackward(parameter);

1
java/java-analysis-impl/src/messages/QuickFixBundle.properties
View File

@@ -133,6 +133,7 @@ make.class.an.interface.text=Make ''{0}'' an interface
make.interface.an.class.text=Make ''{0}'' a class
make.vararg.parameter.last.family=Make vararg parameter last
make.vararg.parameter.last.text=Move ''{0}'' to the end of the list
remove.receiver.parameter=Remove receiver parameter
fix.parameter.type.family=Fix Parameter Type
fix.parameter.type.text=Make ''{0}'' take parameter of type ''{1}'' here
fix.return.type.family=Fix return type

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier8/afterMakeNonStaticReceiverParam.java Normal file
View File

@@ -0,0 +1,4 @@
// "Make 'foo' not static" "true"
class X {
void foo(X this) {}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier8/beforeMakeNonStaticReceiverParam.java Normal file
View File

@@ -0,0 +1,4 @@
// "Make 'foo' not static" "true"
class X {
static void foo(X this<caret>) {}
}