Attachment 212440 Details for Bug 372801 – Proposition of a solution

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposition of a solution

01.patch (text/plain), 1.42 KB, created by Mateusz Matela

on 2012-03-11 19:15:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Matela

Created: 2012-03-11 19:15:35 EDT

Size: 1.42 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java
>index ced5686..34bdea0 100644
>--- a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java
>+++ b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java
>@@ -1202,10 +1202,10 @@
> 	private int useAlignmentBreakIndentation(int emptyLinesRules) {
> 		// preserve line breaks in wrapping if specified
> 		// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=198074
>-		boolean specificEmptyLinesRule = emptyLinesRules != PRESERVE_EMPTY_LINES_KEEP_LAST_NEW_LINES_INDENTATION;
>-		if ((this.currentAlignment != null || specificEmptyLinesRule) && !this.formatter.preferences.join_wrapped_lines) {
>+		if (!this.formatter.preferences.join_wrapped_lines && this.currentAlignment != null && this.currentAlignment.couldBreak()) {
> 			// insert a new line only if it has not been already done before
>-			// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=283476
>+			// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=283467
>+			boolean specificEmptyLinesRule = emptyLinesRules != PRESERVE_EMPTY_LINES_KEEP_LAST_NEW_LINES_INDENTATION;
> 			if (this.lastNumberOfNewLines == 0 || specificEmptyLinesRule || this.formatter.arrayInitializersDepth >= 0) {
> 				
> 				// Do not use alignment break indentation in specific circumstances

Actions: View | Diff

Attachments on bug 372801: 211765 | 212440 | 213608