From c201af56b6d6269ded0b64d6b6e659eebb5657ee Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 14 Jan 2016 15:55:42 +0100 Subject: [PATCH] generate toString: javadoc detection (IDEA-150016) --- .../jetbrains/java/generate/template/TemplateResource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java index 66bbc40ce690..07547226c8a5 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java @@ -122,7 +122,7 @@ public class TemplateResource implements Serializable { */ @Nullable public String getJavaDoc() { - int i = template.indexOf("*/"); + int i = template.trim().startsWith("/*") ? template.indexOf("*/") : -1; if (i == -1) { return null; } @@ -163,7 +163,8 @@ public class TemplateResource implements Serializable { } private static String getMethodSignature(String template) { - String s = after(template, "*/").trim(); + final String trimmed = template.trim(); + String s = trimmed.startsWith("/*") ? after(trimmed, "*/") : trimmed; StringBuffer signature = new StringBuffer();