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

IDEA-137719 Complete current statement doesn't insert a method body for static methods in interfaces, creates broken code

Browse Source
This commit is contained in:
peter
2015-03-23 16:49:05 +01:00
parent 8e9aff7916
commit 4fc7acb38f
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java
View File

@@ -67,7 +67,7 @@ public class MissingMethodBodyFixer implements Fixer {
static boolean shouldHaveBody(PsiMethod method) {
PsiClass containingClass = method.getContainingClass();
if (containingClass == null) return false;
if (containingClass.isInterface() && !method.hasModifierProperty(DEFAULT)) return false;
if (containingClass.isInterface() && !method.hasModifierProperty(DEFAULT) && !method.hasModifierProperty(STATIC)) return false;
if (method.hasModifierProperty(ABSTRACT)) return false;
return !method.hasModifierProperty(NATIVE);
}

3
java/java-tests/testData/codeInsight/completeStatement/StaticInterfaceMethodBody.java Normal file
View File

@@ -0,0 +1,3 @@
public interface Foo {
static void foo(<caret>)
}

5
java/java-tests/testData/codeInsight/completeStatement/StaticInterfaceMethodBody_after.java Normal file
View File

@@ -0,0 +1,5 @@
public interface Foo {
static void foo() {
<caret>
}
}

2
java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java
View File

@@ -18,7 +18,6 @@ package com.intellij.codeInsight;
import com.intellij.JavaTestUtil;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.testFramework.EditorActionTestCase;
@@ -272,6 +271,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testGenericMethodBody() throws Exception { doTest(); }
public void testDefaultMethodBody() { doTest(); }
public void testStaticInterfaceMethodBody() { doTest(); }
public void testArrayInitializerRBracket() throws Exception { doTest(); }