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

IDEA-188880 Make interface method 'default' fix: suppress for methods overriding Object methods

Browse Source
This commit is contained in:
Tagir Valeev
2018-03-27 11:44:59 +07:00
parent 6c125dfd9e
commit 7c193ef32c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
View File

@@ -40,6 +40,7 @@ import org.jetbrains.annotations.Nullable;
import java.text.MessageFormat;
import java.util.*;
import java.util.stream.Stream;
public class HighlightMethodUtil {
private static final QuickFixFactory QUICK_FIX_FACTORY = QuickFixFactory.getInstance();
@@ -1282,7 +1283,10 @@ public class HighlightMethodUtil {
if (!isExtension && !isStatic && !isPrivate) {
description = JavaErrorMessages.message("interface.methods.cannot.have.body");
if (languageLevel.isAtLeast(LanguageLevel.JDK_1_8)) {
additionalFixes.add(QUICK_FIX_FACTORY.createModifierListFix(method, PsiModifier.DEFAULT, true, false));
if (Stream.of(method.findDeepestSuperMethods()).map(PsiMethod::getContainingClass)
.filter(Objects::nonNull).map(PsiClass::getQualifiedName).noneMatch(CommonClassNames.JAVA_LANG_OBJECT::equals)) {
additionalFixes.add(QUICK_FIX_FACTORY.createModifierListFix(method, PsiModifier.DEFAULT, true, false));
}
additionalFixes.add(QUICK_FIX_FACTORY.createModifierListFix(method, PsiModifier.STATIC, true, false));
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier18/beforeMakeDefaultToString.java Normal file
View File

@@ -0,0 +1,4 @@
// "Make 'toString' default" "false"
interface I {
String toS<caret>tring() {return "foo";}
}