diff --git a/org.eclipse.jdt.ui/preview/formatter.java b/org.eclipse.jdt.ui/preview/formatter.java index 849dcd418a1..3ddf7300627 100644 --- a/org.eclipse.jdt.ui/preview/formatter.java +++ b/org.eclipse.jdt.ui/preview/formatter.java @@ -666,6 +666,8 @@ public class Empty {} { @SuppressWarnings("unused") final @Positive int k; } + String s = "123" + """ + abcdef""" + "789"; void foo() { ;; } void empty(@SuppressWarnings("unused") final int i) { }} enum MyEnum { @Deprecated UNDEFINED(0) { }} diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java index dabb4288599..632218f5774 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java @@ -233,6 +233,7 @@ private FormatterMessages() { public static String FormatterModifyDialog_newLines_pref_before_finally_statements; public static String FormatterModifyDialog_newLines_pref_before_while_in_do_statements; public static String FormatterModifyDialog_newLines_pref_empty_statement; + public static String FormatterModifyDialog_newLines_pref_textblock_statement; public static String FormatterModifyDialog_newLines_pref_end_of_file; public static String FormatterModifyDialog_newLines_pref_enum_constants; public static String FormatterModifyDialog_newLines_pref_fields; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties index 3135af04f08..a809a2ac697 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties @@ -460,6 +460,7 @@ FormatterModifyDialog_newLines_pref_keep_type_declaration_on_one_line=Class decl FormatterModifyDialog_newLines_pref_end_of_file=At end of file FormatterModifyDialog_newLines_pref_after_labels=After labels FormatterModifyDialog_newLines_pref_empty_statement=Before empty statement +FormatterModifyDialog_newLines_pref_textblock_statement=After and before opening and closing quotes of text block FormatterModifyDialog_newLines_pref_after_opening_brace_of_array_initializer=After opening brace of array initializer FormatterModifyDialog_newLines_pref_before_closing_brace_of_array_initializer=Before closing brace of array initializer diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java index 419b4fd438f..93ae2c2d767 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java @@ -1336,6 +1336,7 @@ private void createNewLinesTree() { Consumer
modAll= s -> CheckboxPreference.addModifyAll(s, fImages); fTree.builder(FormatterMessages.FormatterModifyDialog_newLines_tree_new_lines, "section-newlines") //$NON-NLS-1$ .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_empty_statement, DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE) + .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_textblock_statement, DefaultCodeFormatterConstants.FORMATTER_PUT_TEXT_BLOCK_QUOTES_ON_NEW_LINE) .gap() .pref(FormatterMessages.FormatterModifyDialog_newLines_pref_after_opening_brace_of_array_initializer, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER) @@ -1374,7 +1375,7 @@ private void createNewLinesTree() { .build(null, (parent, label, key) -> { String[] values= CheckboxPreference.DO_NOT_INSERT_INSERT; if (parent.getKey().endsWith("-ifelse") || parent.getKey().endsWith("-simpleloops") //$NON-NLS-1$ //$NON-NLS-2$ - || DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE.equals(key)) { + || DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE.equals(key) || DefaultCodeFormatterConstants.FORMATTER_PUT_TEXT_BLOCK_QUOTES_ON_NEW_LINE.equals(key) ) { values= CheckboxPreference.FALSE_TRUE; } return fTree.addCheckbox(parent, label, key, values);