From 06d6ad7180bcb7f7a0e0c04c1e410ee4c011d244 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 1 Apr 2014 15:38:56 +0200 Subject: [PATCH] static in interfaces before 1.8 (IDEA-123252) --- .../codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java | 3 ++- .../advHighlighting6/UnsupportedFeatures7.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 7e3f3b8e4667..388ef238b6e4 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -760,7 +760,8 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh if (!myHolder.hasErrorResults() && method.isConstructor()) { myHolder.add(HighlightClassUtil.checkThingNotAllowedInInterface(method, aClass)); } - if (!myHolder.hasErrorResults() && method.hasModifierProperty(PsiModifier.DEFAULT)) { + if (!myHolder.hasErrorResults() && (method.hasModifierProperty(PsiModifier.DEFAULT) || + aClass != null && aClass.isInterface() && method.hasModifierProperty(PsiModifier.STATIC))) { myHolder.add(HighlightUtil.checkExtensionMethodsFeature(method, myLanguageLevel, myFile)); } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/UnsupportedFeatures7.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/UnsupportedFeatures7.java index d0d4dbc5324a..ac3eb042da5f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/UnsupportedFeatures7.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/UnsupportedFeatures7.java @@ -45,5 +45,6 @@ class UnsupportedFeatures { interface I { default void m() { } + static void m() { } } }