From 2eea5af497a3f1e961c0d6987c87df69432ff385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=98=E7=A0=94?= <huawen.phw@alibaba-inc.com>
Date: Tue, 4 Dec 2018 18:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8D=A2=E8=A1=8C=EF=BC=8C=E4=B8=8EIDEA?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 p3c-formatter/eclipse-codestyle.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/p3c-formatter/eclipse-codestyle.xml b/p3c-formatter/eclipse-codestyle.xml
index e1243fd35..42b305523 100755
--- a/p3c-formatter/eclipse-codestyle.xml
+++ b/p3c-formatter/eclipse-codestyle.xml
@@ -411,10 +411,6 @@
         <!--org.eclipse.jdt.core.formatter.enabling_tag=FORMATTER_ON_TAG-->
         <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
 
-        <!--use default do not insert-->
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-
-
         <!--下面的没有IDEA对应项，在代码里面对IDEA中使用默认值即可,LINE_COMMENT_AT_FIRST_COLUMN BLOCK_COMMENT_AT_FIRST_COLUMN设置为false-->
         <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
@@ -433,7 +429,9 @@
         <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
 
         <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+        <!--和IDEA保持一致，注释换行-->
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
 
 
         <!--comment end-->