This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f95552b61b Tweak formatting settings
f95552b61b is described below
commit f95552b61b199f4e047e4bc751aa43be6d5aaf00
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 13 17:09:53 2023 +0100
Tweak formatting settings
- Use Map<String,String> rather than Map<String, String>
- Ensure line wrap occurs after the operator
- Better line wrapping for assignments
---
res/ide-support/eclipse/formatting-asf-tomcat.xml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/res/ide-support/eclipse/formatting-asf-tomcat.xml
b/res/ide-support/eclipse/formatting-asf-tomcat.xml
index 7a4effe304..c58449c8a1 100644
--- a/res/ide-support/eclipse/formatting-asf-tomcat.xml
+++ b/res/ide-support/eclipse/formatting-asf-tomcat.xml
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<profiles version="22">
- <profile kind="CodeFormatterProfile" name="asf-tomcat" version="22">
+<profiles version="23">
+ <profile kind="CodeFormatterProfile" name="asf-tomcat" version="23">
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
value="do not insert"/>
@@ -41,7 +41,7 @@
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant"
value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags"
value="false"/>
- <setting
id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch"
value="true"/>
+ <setting
id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch"
value="false"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag"
value="@formatter:on"/>
<setting
id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
@@ -76,7 +76,7 @@
<setting
id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body"
value="0"/>
<setting
id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause"
value="common_lines"/>
- <setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
value="insert"/>
+ <setting
id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call"
value="16"/>
@@ -108,7 +108,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation"
value="3"/>
<setting
id="org.eclipse.jdt.core.formatter.align_type_members_on_columns"
value="false"/>
- <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment"
value="0"/>
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment"
value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
value="do not insert"/>
@@ -128,7 +128,7 @@
<setting id="org.eclipse.jdt.core.formatter.comment.format_header"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression"
value="16"/>
- <setting
id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator"
value="true"/>
+ <setting
id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting
id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines"
value="2147483647"/>
@@ -174,6 +174,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
value="do not insert"/>
+ <setting
id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration"
value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
value="do not insert"/>
@@ -321,7 +322,7 @@
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field"
value="49"/>
- <setting
id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator"
value="true"/>
+ <setting
id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
value="do not insert"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
