Further Refine JSpecify support

Support `@Nullable` annotations in method bodies. Fixes gh-442

Author: philwebb

spring-javaformat/spring-javaformat-formatter-tests/src/test/resources/expected/nullable.txt

@@ -19,4 +19,11 @@ public interface ExampleNullables {
 Object myArrayMethod(@Nullable String string, @Nullable String @Nullable [] array,
 @Nullable String @Nullable ... varargs);
 
+default Object inBody() {
+@Nullable Object[] args = new Object[length];
+@Nullable List<@Nullable Object> list = new Object[length];
+Object @Nullable [] moreArgs = new Object[length];
+return args;
+}
+
 }

spring-javaformat/spring-javaformat-formatter-tests/src/test/resources/source/nullable.txt

@@ -17,4 +17,11 @@ public interface ExampleNullables {
 Object myArrayMethod(@Nullable String string, @Nullable String @Nullable [] array, @Nullable
 String @Nullable ...	varargs);
 
+default Object inBody() {
+@Nullable Object[] args = new Object[length];
+@Nullable List<@Nullable Object> list = new Object[length];
+Object @Nullable [] moreArgs = new Object[length];
+return args;
+}
+
 }

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/JSpecifyPreparator.java

@@ -33,6 +33,7 @@
 import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.ImportDeclaration;
 import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.MethodDeclaration;
 import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.SingleVariableDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk17.core.dom.VariableDeclarationStatement;
 import io.spring.javaformat.eclipse.jdt.jdk17.core.formatter.CodeFormatter;
 import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.Preparator;
 import io.spring.javaformat.eclipse.jdt.jdk17.internal.formatter.TokenManager;
@@ -86,12 +87,14 @@ public boolean visit(ImportDeclaration node) {
 }
 
 @Override
-@SuppressWarnings("unchecked")
 public boolean visit(MethodDeclaration node) {
-Annotation lastAnnotation = getLastAnnotation((List<IExtendedModifier>) node.modifiers());
-if (isJSpecifyAnnotation(lastAnnotation)) {
-this.tokenManager.lastTokenIn(lastAnnotation, -1).clearLineBreaksAfter();
-}
+clearLineBreaksIfHasJSpecifyAnnotation(node.modifiers());
+return true;
+}
+
+@Override
+public boolean visit(VariableDeclarationStatement node) {
+clearLineBreaksIfHasJSpecifyAnnotation(node.modifiers());
 return true;
 }
 
@@ -107,6 +110,14 @@ public void endVisit(SingleVariableDeclaration node) {
 }
 }
 
+@SuppressWarnings("unchecked")
+private void clearLineBreaksIfHasJSpecifyAnnotation(List<?> modifiers) {
+Annotation lastAnnotation = getLastAnnotation((List<IExtendedModifier>) modifiers);
+if (isJSpecifyAnnotation(lastAnnotation)) {
+this.tokenManager.lastTokenIn(lastAnnotation, -1).clearLineBreaksAfter();
+}
+}
+
 private Annotation getLastAnnotation(List<? extends IExtendedModifier> modifiers) {
 Annotation annotation = null;
 for (IExtendedModifier modifier : modifiers) {

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk8/eclipse/JSpecifyPreparator.java

@@ -33,6 +33,7 @@
 import io.spring.javaformat.eclipse.jdt.jdk8.core.dom.ImportDeclaration;
 import io.spring.javaformat.eclipse.jdt.jdk8.core.dom.MethodDeclaration;
 import io.spring.javaformat.eclipse.jdt.jdk8.core.dom.SingleVariableDeclaration;
+import io.spring.javaformat.eclipse.jdt.jdk8.core.dom.VariableDeclarationStatement;
 import io.spring.javaformat.eclipse.jdt.jdk8.core.formatter.CodeFormatter;
 import io.spring.javaformat.eclipse.jdt.jdk8.internal.formatter.Preparator;
 import io.spring.javaformat.eclipse.jdt.jdk8.internal.formatter.TokenManager;
@@ -86,12 +87,14 @@ public boolean visit(ImportDeclaration node) {
 }
 
 @Override
-@SuppressWarnings("unchecked")
 public boolean visit(MethodDeclaration node) {
-Annotation lastAnnotation = getLastAnnotation((List<IExtendedModifier>) node.modifiers());
-if (isJSpecifyAnnotation(lastAnnotation)) {
-this.tokenManager.lastTokenIn(lastAnnotation, -1).clearLineBreaksAfter();
-}
+clearLineBreaksIfHasJSpecifyAnnotation(node.modifiers());
+return true;
+}
+
+@Override
+public boolean visit(VariableDeclarationStatement node) {
+clearLineBreaksIfHasJSpecifyAnnotation(node.modifiers());
 return true;
 }
 
@@ -107,6 +110,14 @@ public void endVisit(SingleVariableDeclaration node) {
 }
 }
 
+@SuppressWarnings("unchecked")
+private void clearLineBreaksIfHasJSpecifyAnnotation(List<?> modifiers) {
+Annotation lastAnnotation = getLastAnnotation((List<IExtendedModifier>) modifiers);
+if (isJSpecifyAnnotation(lastAnnotation)) {
+this.tokenManager.lastTokenIn(lastAnnotation, -1).clearLineBreaksAfter();
+}
+}
+
 private Annotation getLastAnnotation(List<? extends IExtendedModifier> modifiers) {
 Annotation annotation = null;
 for (IExtendedModifier modifier : modifiers) {