Skip to content

text block newline formatter settings #2936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjohnstn merged 4 commits into from
May 1, 2026
Merged

text block newline formatter settings #2936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ae7d8d
Add option for new formatter in ui
inuyasha82 Apr 7, 2026
67e41f7
Update logic for newline on textblock to FormatterDialog
inuyasha82 Apr 13, 2026
a83eac8
Changes requested in PR
inuyasha82 Apr 14, 2026
032ffa0
Add sample text block to preview for newlines
jjohnstn May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions org.eclipse.jdt.ui/preview/formatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) { }}
Expand Down
1 change: 1 addition & 0 deletions ...clipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions ....jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...se.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,7 @@ private void createNewLinesTree() {
Consumer<Section> 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)
Expand Down Expand Up @@ -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);
Expand Down
Loading