[java-completion] Fix method body without () only when type is void (IDEA-23781)

GitOrigin-RevId: d669b3447dce6186a10f8b807b86bb14f9b98f82

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

@@ -30,7 +30,7 @@ public class MissingMethodBodyFixer implements Fixer {
   @Override
   public void apply(Editor editor, JavaSmartEnterProcessor processor, PsiElement psiElement) throws IncorrectOperationException {
     if (psiElement instanceof PsiField) {
-      // replace something like `int x` with `int x() {...}`
+      // replace something like `void x` with `void x() {...}`
       // while it's ambiguous whether user wants a field or a method, declaring a field is easier (just append a semicolon),
       // so completing a method looks more useful
       PsiField field = (PsiField)psiElement;
@@ -42,11 +42,7 @@ public class MissingMethodBodyFixer implements Fixer {
       if (modifiers == null) return;
       // Impossible modifiers for a method
       if (modifiers.hasExplicitModifier(TRANSIENT) || modifiers.hasExplicitModifier(VOLATILE)) return;
-      // Modifier combination which is unlikely to see on methods but quite reasonable on fields
-      if ((modifiers.hasExplicitModifier(STATIC) || modifiers.hasExplicitModifier(PRIVATE)) &&
-          modifiers.hasExplicitModifier(FINAL)) {
-        return;
-      }
+      if (!PsiType.VOID.equals(field.getType())) return;
       int endOffset = field.getTextRange().getEndOffset();
       editor.getDocument().insertString(endOffset, "(){}");
       editor.getCaretModel().moveToOffset(endOffset + 1);

java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation_after.java

@@ -1,7 +1,6 @@
 public class Test {
 
-    private String s(<caret>) {
-    }
+    private String s;<caret>
 
     @Deprecated private String foo;
 }

java/java-tests/testData/codeInsight/completeStatement/Field_after.java

@@ -1,4 +1,3 @@
 public class Test {
-    String s(<caret>) {
-    }
+    String s;<caret>
 }

java/java-tests/testData/codeInsight/completeStatement/VoidMethodIncomplete.java

@@ -0,0 +1,3 @@
+public class FieldWithEquals {
+  void foo<caret>
+}

java/java-tests/testData/codeInsight/completeStatement/VoidMethodIncomplete_after.java

@@ -0,0 +1,4 @@
+public class FieldWithEquals {
+    void foo(<caret>) {
+    }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/CompleteStatementTest.java

@@ -85,6 +85,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
   public void testField() { doTest(); }
   public void testMethod() { doTest(); }
   public void testLikelyField() { doTest(); }
+  public void testVoidMethodIncomplete() { doTest(); }
   public void testFieldWithEquals() { doTest(); }
   public void testClass() { doTest(); }
   public void testInnerEnumBeforeMethod() { doTest(); }