IDEA-54396 (type annotations in "Wrap Return Value")

java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/ReturnValueBeanBuilder.java

@@ -96,12 +96,12 @@ class ReturnValueBeanBuilder {
   }
 
   private void outputField(StringBuilder out) {
-    final String typeText = myValueType.getCanonicalText();
+    final String typeText = myValueType.getCanonicalText(false);
     out.append('\t' + "private final ").append(typeText).append(' ').append(getFieldName("value")).append(";");
   }
 
   private void outputConstructor(StringBuilder out) {
-    final String typeText = myValueType.getCanonicalText();
+    final String typeText = myValueType.getCanonicalText(true);
     final String name = "value";
     final String parameterName = JavaCodeStyleManager.getInstance(myProject).propertyNameToVariableName(name, VariableKind.PARAMETER);
     final String fieldName = getFieldName(name);
@@ -119,7 +119,7 @@ class ReturnValueBeanBuilder {
   }
 
   private void outputGetter(StringBuilder out) {
-    final String typeText = myValueType.getCanonicalText();
+    final String typeText = myValueType.getCanonicalText(true);
     final String name = "value";
     final String capitalizedName = StringUtil.capitalize(name);
     final String fieldName = getFieldName(name);

java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java

@@ -762,7 +762,7 @@ public class PsiImplUtil {
   private static final Key<Boolean> TYPE_ANNO_MARK = Key.create("type.annotation.mark");
 
   public static void markTypeAnnotations(@NotNull PsiTypeElement typeElement) {
-    PsiElement left = PsiTreeUtil.skipSiblingsBackward(typeElement, PsiComment.class, PsiWhiteSpace.class, PsiAnnotation.class);
+    PsiElement left = PsiTreeUtil.skipSiblingsBackward(typeElement, PsiComment.class, PsiWhiteSpace.class, PsiTypeParameterList.class);
     if (left instanceof PsiModifierList) {
       for (PsiAnnotation annotation : ((PsiModifierList)left).getAnnotations()) {
         if (isTypeAnnotation(annotation)) {
@@ -773,7 +773,7 @@ public class PsiImplUtil {
   }
 
   public static void deleteTypeAnnotations(@NotNull PsiTypeElement typeElement) {
-    PsiElement left = PsiTreeUtil.skipSiblingsBackward(typeElement, PsiComment.class, PsiWhiteSpace.class, PsiAnnotation.class);
+    PsiElement left = PsiTreeUtil.skipSiblingsBackward(typeElement, PsiComment.class, PsiWhiteSpace.class, PsiTypeParameterList.class);
     if (left instanceof PsiModifierList) {
       for (PsiAnnotation annotation : ((PsiModifierList)left).getAnnotations()) {
         if (TYPE_ANNO_MARK.get(annotation) == Boolean.TRUE) {

java/java-tests/testData/refactoring/wrapReturnValue/typeAnnotations/after/Test.java

@@ -0,0 +1,10 @@
+import java.lang.annotation.*;
+
+@Target({ElementType.TYPE_USE})
+@interface TA { }
+
+class Test {
+    Wrapper foo() {
+        return new Wrapper(null);
+    }
+}

java/java-tests/testData/refactoring/wrapReturnValue/typeAnnotations/after/Wrapper.java

@@ -0,0 +1,13 @@
+import java.util.List;
+
+public class Wrapper {
+    private final List<String> value;
+
+    public Wrapper(@TA List<@TA String> value) {
+        this.value = value;
+    }
+
+    public @TA List<@TA String> getValue() {
+        return value;
+    }
+}

java/java-tests/testData/refactoring/wrapReturnValue/typeAnnotations/before/Test.java

@@ -0,0 +1,11 @@
+import java.lang.annotation.*;
+import java.util.*;
+
+@Target({ElementType.TYPE_USE})
+@interface TA { }
+
+class Test {
+    @TA List<@TA String> foo() {
+        return null;
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java

@@ -54,6 +54,7 @@ public class WrapReturnValueTest extends MultiFileTestCase {
   public void testStaticMethodInnerClass() { doTest(false, null, true); }
   public void testRawReturnType() { doTest(true, "Existing class does not have appropriate constructor"); }
   public void testReturnInsideLambda() { doTest(false, null, true); }
+  public void testTypeAnnotations() { doTest(false); }
 
   private void doTest(final boolean existing) {
     doTest(existing, null);