generate by template: do not delete parts of method signature (IDEA-157445)

java/java-tests/testData/codeInsight/generateToString/afterAnnotationOnMethod.java

@@ -0,0 +1,6 @@
+class Test {
+    @NotNull
+    public String toString() {
+        return null;
+    }
+}

java/java-tests/testData/codeInsight/generateToString/afterJavadocOnMethod.java

@@ -0,0 +1,8 @@
+class Test {
+    /**
+     * my comment
+     */
+    public String toString() {
+        return null;
+    }
+}

java/java-tests/testData/codeInsight/generateToString/beforeAnnotationOnMethod.java

@@ -0,0 +1,3 @@
+class Test {
+  <caret>
+}

java/java-tests/testData/codeInsight/generateToString/beforeJavadocOnMethod.java

@@ -0,0 +1,3 @@
+class Test {
+  <caret>
+}

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import org.jetbrains.java.generate.GenerateToStringWorker;
+import org.jetbrains.java.generate.template.TemplateResource;
+
+import java.util.Collections;
+
+public class GenerateToStringTest extends LightCodeInsightTestCase {
+
+  public void testAnnotationOnMethod() throws Exception {
+    doTest(new TemplateResource("a.java", "@NotNull public String toString() {return null;}", false));
+  }
+
+  public void testJavadocOnMethod() throws Exception {
+    doTest(new TemplateResource("a.java", "/** my comment*/ public String toString() {return null;}", false));
+  }
+
+  private void doTest(final TemplateResource templateResource) throws Exception {
+    configureByFile("/codeInsight/generateToString/before" + getTestName(false) + ".java");
+
+    final Editor editor = getEditor();
+    final PsiElement elementAt = getFile().findElementAt(editor.getCaretModel().getOffset());
+    final PsiClass clazz = PsiTreeUtil.getParentOfType(elementAt, PsiClass.class);
+    assertNotNull(clazz);
+    WriteAction.run(() -> {
+      new GenerateToStringWorker(clazz, editor, false).execute(Collections.emptyList(), templateResource);
+    });
+    checkResultByFile("/codeInsight/generateToString/after" + getTestName(false) + ".java");
+  }
+}

plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java

@@ -166,6 +166,11 @@ public class TemplateResource implements Serializable {
     final String trimmed = template.trim();
     String s = trimmed.startsWith("/*") ? after(trimmed, "*/") : trimmed;
 
+    final int indexOf = s.indexOf('{');
+    if (indexOf > 0) {
+      return s.substring(0, indexOf).trim();
+    }
+
     StringBuffer signature = new StringBuffer();
 
     String[] lines = s.split("\n");