introduce variable: don't duplicate comments (IDEA-195399)

java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java

@@ -921,10 +921,6 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
             declaration = addDeclaration(declaration, initializer);
             LOG.assertTrue(expr1.isValid());
             if (deleteSelf) {
-              final PsiElement lastChild = statement.getLastChild();
-              if (lastChild instanceof PsiComment) { // keep trailing comment
-                declaration.addBefore(lastChild, null);
-              }
               CommentTracker commentTracker = new CommentTracker();
               commentTracker.markUnchanged(initializer);
               commentTracker.deleteAndRestoreComments(statement);

java/java-tests/testData/refactoring/introduceVariable/KeepComments.after.java

@@ -10,5 +10,6 @@ class Main {
                 .toArray()//c-1
                 .toString();//c1
 //c2
+//c3
     }
 }

java/java-tests/testData/refactoring/introduceVariable/KeepComments.java

@@ -11,6 +11,6 @@ class Main {
                 .toString()</selection>
         //c1
         //c2
-        ;
+        ;//c3
     }
 }