From 6fd644de45b72f7c3baa5722a43d7e5d5661bf1d Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Tue, 29 May 2018 15:37:57 +0300 Subject: [PATCH] Fixed IDEA-175161 Javadoc formatter joins lines incorrectly Never merge a leading asterisk to the previous line. --- .../formatter/java/JavaSpacePropertyProcessor.java | 3 +++ .../java/psi/formatter/java/JavadocFormatterTest.kt | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java index bb190a69381f..1264dce284c9 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java @@ -1193,6 +1193,9 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor { else if (myRole1 == ChildRole.OPERATION_SIGN) { createSpaceInCode(mySettings.SPACE_AROUND_UNARY_OPERATOR); } + else if (myType2 == JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS) { + createSpaceProperty(false, true, 0); + } else if ((myType1 == JavaDocTokenType.DOC_TAG_VALUE_TOKEN || myType1 == JavaDocElementType.DOC_TAG_VALUE_ELEMENT) && (myType2 == JavaDocTokenType.DOC_TAG_VALUE_TOKEN || myType2 == JavaDocElementType.DOC_TAG_VALUE_ELEMENT)) { createSpaceInCode(true); diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt index 7918e39938e3..8f398da4aae5 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.kt @@ -1185,14 +1185,13 @@ interface Test { } - fun _testIdea175161() { + fun testIdea175161() { getSettings().RIGHT_MARGIN = 160; getSettings().WRAP_COMMENTS = true; getSettings().KEEP_LINE_BREAKS = false; doTextTest( -""" -package com.company; +"""package com.company; public class Test { @@ -1206,14 +1205,13 @@ public class Test { } """, -""" -package com.company; +"""package com.company; public class Test { /** - * Shortcut method for EntryDto items. This method will fetch the id from {@code item} and pass it to {@link #test2(Object, Object, Object, Object, Object)}. - * Make sure the dto item returns a non-null id. + * Shortcut method for EntryDto items. This method will fetch the id from {@code item} and pass it to {@link #test2(Object, Object, Object, Object, + * Object)}. Make sure the dto item returns a non-null id. */ public void test() { }