Attachment #252854 for bug #458208

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

Lines 9-14 Link Here

(-)a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunFormatterTests.java (+2 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Jesper S Moller - Contribution for bug 402173	10	* Jesper S Moller - Contribution for bug 402173
11	* Contribution for bug 402892	11	* Contribution for bug 402892
		12	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
12	*******************************************************************************/	13	*******************************************************************************/
13	package org.eclipse.jdt.core.tests;	14	package org.eclipse.jdt.core.tests;
14		15
Lines 37-42 Link Here
37	TEST_SUITES.add(FormatterCommentsClearBlankLinesTests.class);	38	TEST_SUITES.add(FormatterCommentsClearBlankLinesTests.class);
38	TEST_SUITES.add(FormatterJavadocDontIndentTagsTests.class);	39	TEST_SUITES.add(FormatterJavadocDontIndentTagsTests.class);
39	TEST_SUITES.add(FormatterJavadocDontIndentTagsDescriptionTests.class);	40	TEST_SUITES.add(FormatterJavadocDontIndentTagsDescriptionTests.class);
		41	TEST_SUITES.add(FormatterOldBugsGistTests.class);
40	}	42	}
41		43
42	public static Class[] getTestClasses() {	44	public static Class[] getTestClasses() {




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
 *******************************************************************************/
package org.eclipse.jdt.core.tests.formatter;


			"			// nothing\n" +
			"			System.out.println(\"\");\n" +
			"			return \"\";\n" +
			"		});\n" +
			"	}\n" +
			"\n" +
			"	public Function<String, String> testBad() {\n" +

			"			// nothing\n" +
			"			System.out.println(\"\");\n" +
			"			return \"\";\n" +
			"		});\n" +
			"	}\n" +
			"\n" +
			"	public Function<String, String> foo(Function<String, String> f) {\n" +

			"				}\n"+
			"			}\n"+
			"\n"+
			"		}).start();\n"+
			"	}\n"+
			"}\n";





 *     Robin Stocker - Bug 49619 - [formatting] comment formatter leaves whitespace in comments
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] IndexOutOfBoundsException in TokenManager - https://bugs.eclipse.org/462945
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
 *******************************************************************************/
package org.eclipse.jdt.core.tests.formatter;


// see also bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=287462
public void testBug198074_dup201022() throws JavaModelException {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.wrap_before_binary_operator = false;
	String source =
		"public class Test {\n" +
		"\n" +

// duplicate bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=213700
public void testBug198074_dup213700() throws JavaModelException {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.wrap_before_binary_operator = false;
	String source =
		"public class Test {\n" +
		"\n" +

		"@MessageDriven(mappedName = \"filiality/SchedulerMQService\",\n" + 
		"		activationConfig = {\n" + 
		"				@ActivationConfigProperty(propertyName = \"cronTrigger\",\n" + 
		"						propertyValue = \"0/10 * * * * ?\")\n" + 
		"		})\n" + 
		"@RunAs(\"admin\")\n" + 
		"@ResourceAdapter(\"quartz-ra.rar\")\n" + 
		"@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" + 

		"public class X07 {\n" + 
		"\n" + 
		"	static final long[] jjtoToken = {\n" + 
		"			0x7fbfecffL,\n" + 
		"	};\n" + 
		"	static final long[] jjtoSkip = {\n" + 
		"			0x400000L,\n" + 
		"	};\n" + 
		"\n" + 
		"}\n"
	);

		"\n" + 
		"	static final long[] jjtoToken =\n" + 
		"	{\n" + 
		"			0x7fbfecffL,\n" + 
		"	};\n" + 
		"	static final long[] jjtoSkip =\n" + 
		"	{\n" + 
		"			0x400000L,\n" +
		"	};\n" + 
		"\n" + 
		"}\n"
	);

		"public class X09 {\n" + 
		"	public Class[] getAdapterList() {\n" + 
		"		return new Class[] {\n" + 
		"				IWorkbenchAdapter.class\n" + 
		"		};\n" + 
		"	}\n" + 
		"}\n"
	);

}
public void testBug330313_wksp1_25_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.wrap_before_binary_operator = false;
	String source =
		"package wksp1;\n" + 
		"\n" + 

}
public void testBug330313_wksp1_26_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.wrap_before_binary_operator = false;
	String source =
		"package wksp1;\n" + 
		"\n" + 

}
public void testBug330313_wksp1_30_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.wrap_before_binary_operator = false;
	setPageWidth80();
	String source =
		"package wksp1;\n" + 

}
public void testBug330313_wksp1_33_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.wrap_before_binary_operator = false;
	String source =
		"package wksp1;\n" + 
		"\n" + 

		"	void foo() {\n" + 
		"		if (inMetaTag &&\n" + 
		"				(t1.image.equalsIgnoreCase(\"name\") ||\n" + 
		"						t1.image.equalsIgnoreCase(\"HTTP-EQUIV\"))\n" + 
		"				&& t2 != null) {\n" + 
		"			currentMetaTag = t2.image.toLowerCase();\n" + 
		"		}\n" + 
		"	}\n" + 

		"	 * 		\"GeneralPage.DoubleClick\", resName, 1,\n" + 
		"	 * 		new String[][] {\n" + 
		"	 * 				{ \"Open Browser\", \"open\" },\n" + 
		"	 * 				{ \"Expand Tree\", \"expand\" }\n" + 
		"	 * 		},\n" + 
		"	 * 		parent);\n" + 
		"	 * </pre>\n" + 
		"	 */\n" + 

		"			/* INACTIVE */ { \"INACTIVE\", \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\" },\n" + 
		"			/* PARTLY_ACTIVE */ { \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\",\n" + 
		"					\"PARTLY_ACTIVE\" },\n" + 
		"			/* ACTIVE */ { \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\", \"ACTIVE\" }\n" + 
		"	};\n" + 
		"}\n"
	);
}

		"				user,\n" + 
		"				revision,\n" + 
		"				String.valueOf(delta),\n" + 
		"				line\n" + 
		"		});\n" + 
		"	}\n" + 
		"}\n"
	);

		"							IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" + 
		"					new Color[] {\n" + 
		"							colorRegistry.get(\n" + 
		"									IWorkbenchThemeConstants.INACTIVE_TAB_BG_START)\n" + 
		"					},\n" + 
		"					new int[0],\n" + 
		"					true);\n" + 
		"		}\n" + 

		"								public char[][] getCompoundName() {\n" + 
		"									return EvaluationConstants.ROOT_COMPOUND_NAME;\n" + 
		"								}\n" + 
		"							}\n" + 
		"					},\n" + 
		"					null);\n" + 
		"		}\n" + 
		"	}\n" + 

		"								return info.getLocal()\n" + 
		"										.getType() == IResource.FILE;\n" + 
		"							}\n" + 
		"						}\n" + 
		"				}),\n" + 
		"				// Conflicting changes of files will fail if the local is not\n" + 
		"				// managed\n" + 
		"				// or is an addition\n" + 

		"								}\n" + 
		"								return false;\n" + 
		"							}\n" + 
		"						}\n" + 
		"				}),\n" + 
		"				// Conflicting changes involving a deletion on one side will\n" + 
		"				// aways fail\n" + 
		"				new AndSyncInfoFilter(new FastSyncInfoFilter[] {\n" + 

		"											&& !base.equals(remote));\n" + 
		"								}\n" + 
		"							}\n" + 
		"						}\n" + 
		"				}),\n" + 
		"				// Conflicts where the file type is binary will work but are not\n" + 
		"				// merged\n" + 
		"				// so they should be skipped\n" + 

		"								}\n" + 
		"								return false;\n" + 
		"							}\n" + 
		"						}\n" + 
		"				}),\n" + 
		"				// Outgoing changes may not fail but they are skipped as well\n" + 
		"				new SyncInfoDirectionFilter(SyncInfo.OUTGOING)\n" + 
		"		});\n" + 
		"	}\n" + 
		"}\n"
	);

		"					{ 104, 20 },\n" + 
		"					{ 108, 21 },\n" + 
		"					{ 12, 1856 },\n" + 
		"					{ 13, 1920 } },\n" + 
		"	};\n" + 
		"}\n"
	);
}

		"					UNKNOWN,\n" + 
		"					UNKNOWN,\n" + 
		"					UNKNOWN,\n" + 
		"					UNKNOWN }\n" + 
		"	};\n" + 
		"\n" + 
		"}\n"
	);

		"					\"READ_POTENTIAL\",\n" + 
		"					\"UNKNOWN\",\n" + 
		"					\"UNKNOWN\",\n" + 
		"					\"UNKNOWN\" },\n" + 
		"	};\n" + 
		"\n" + 
		"}\n"
	);

		"					\"READ_POTENTIAL\",\n" + 
		"					\"UNKNOWN\",\n" + 
		"					\"UNKNOWN\",\n" + 
		"					\"UNKNOWN\" },\n" + 
		"	};\n" + 
		"\n" + 
		"}\n"
	);

		"                    \"1234567890123456789012345678901234567890\" },\n" + 
		"            /* Comment 3 */ {\n" + 
		"                    \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\",\n" + 
		"                    \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\" },\n" + 
		"    };\n" + 
		"\n" + 
		"}\n"
	);

	String source = "/**/int f;";
	formatSource(source, source, CodeFormatter.K_STATEMENTS);
}
/**
 * @bug 458208: [formatter] follow up bug for comments 
 * @test test a space is not added after a lambda expression in parenthesis
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c2"
 */
public void testBug458208() throws Exception {
	String source =
		"package p;\n" + 
		"import java.util.function.IntConsumer;\n" + 
		"class TestInlineLambda1 {\n" + 
		"	{\n" + 
		"		IntConsumer op = (x -> {}    );\n" + 
		"	}\n" + 
		"}\n";
	formatSource(source,
		"package p;\n" + 
		"\n" + 
		"import java.util.function.IntConsumer;\n" + 
		"\n" + 
		"class TestInlineLambda1 {\n" + 
		"	{\n" + 
		"		IntConsumer op = (x -> {\n" + 
		"		});\n" + 
		"	}\n" + 
		"}\n"
	);
}
/**
 * @bug 458208: [formatter] follow up bug for comments 
 * @test test that comments in switch statements are properly indented
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c21"
 */
public void testBug458208b() throws Exception {
	formatSource(
		"package p;\n" + 
		"\n" + 
		"public class C1 {\n" + 
		"	void foo(int x) {\n" + 
		"		switch (x) {\n" + 
		"		// case 1\n" + 
		"		case 1:\n" + 
		"			break;\n" + 
		"		// case 2\n" + 
		"		case 2:\n" + 
		"			break;\n" + 
		"		// no more cases\n" + 
		"		}\n" + 
		"	}\n" + 
		"\n" + 
		"	int bar(int x) {\n" + 
		"		while (true) {\n" + 
		"			int y = 9;\n" + 
		"			switch (x) {\n" + 
		"			// case 1\n" + 
		"			case 1:\n" + 
		"				// should return\n" + 
		"				return y;\n" + 
		"			// case 2\n" + 
		"			case 2:\n" + 
		"				// should break\n" + 
		"				break;\n" + 
		"			case 3:\n" + 
		"				// TODO\n" + 
		"			}\n" + 
		"		}\n" + 
		"	}\n" + 
		"}\n"
	);
}
/**
 * @bug 458208: [formatter] follow up bug for comments 
 * @test test that elements separated with empty lines are properly indented
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c18"
 */
public void testBug458208c() throws Exception {
	final int wrapAllOnColumn = Alignment.M_NEXT_PER_LINE_SPLIT + Alignment.M_INDENT_ON_COLUMN + Alignment.M_FORCE;
	this.formatterPrefs.alignment_for_enum_constants = wrapAllOnColumn;
	this.formatterPrefs.alignment_for_arguments_in_enum_constant = wrapAllOnColumn;
	this.formatterPrefs.alignment_for_expressions_in_array_initializer = wrapAllOnColumn;
	String source = 
		"package p;\n" + 
		"\n" + 
		"public enum TestEnum {\n" + 
		"	FIRST_ENUM(\"first type\",\n" + 
		"	           new SomeClass(),\n" + 
		"	           new OtherEnumType[] { OtherEnumType.FOO }),\n" + 
		"\n" + 
		"	SECOND_ENUM(\"second type\",\n" + 
		"	            new SomeClassOtherClass(),\n" + 
		"	            new OtherEnumType[] { OtherEnumType.BAR }),\n" + 
		"\n" + 
		"	THIRD_ENUM(\"third type\",\n" + 
		"	            new YetAnotherClass(),\n" + 
		"	            new OtherEnumType[] { OtherEnumType.FOOBAR,\n" + 
		"	                                  OtherEnumType.FOOBARBAZ,\n" + 
		"\n" + 
		"	                                  OtherEnumType.LONGERFOOBARBAZ,\n" + 
		"	                                  OtherEnumType.MORELETTERSINHERE });\n" + 
		"\n" + 
		"	/* data members and methods go here */\n" + 
		"	TestEnum(String s, Cls s1, OtherEnumType[] e) {\n" + 
		"	}\n" + 
		"}";
	formatSource(source,
		"package p;\n" + 
		"\n" + 
		"public enum TestEnum {\n" + 
		"						FIRST_ENUM(	\"first type\",\n" + 
		"									new SomeClass(),\n" + 
		"									new OtherEnumType[] { OtherEnumType.FOO }),\n" + 
		"\n" + 
		"						SECOND_ENUM(\"second type\",\n" + 
		"									new SomeClassOtherClass(),\n" + 
		"									new OtherEnumType[] { OtherEnumType.BAR }),\n" + 
		"\n" + 
		"						THIRD_ENUM(	\"third type\",\n" + 
		"									new YetAnotherClass(),\n" + 
		"									new OtherEnumType[] {	OtherEnumType.FOOBAR,\n" + 
		"															OtherEnumType.FOOBARBAZ,\n" + 
		"\n" + 
		"															OtherEnumType.LONGERFOOBARBAZ,\n" + 
		"															OtherEnumType.MORELETTERSINHERE });\n" + 
		"\n" + 
		"	/* data members and methods go here */\n" + 
		"	TestEnum(String s, Cls s1, OtherEnumType[] e) {\n" + 
		"	}\n" + 
		"}"
	);
}
/**
 * @bug 458208: [formatter] follow up bug for comments 
 * @test test that enum constants are not indented with spaces when "Use spaces to indent wrapped lines" is on
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c24"
 */
public void testBug458208d() throws Exception {
	this.formatterPrefs.alignment_for_enum_constants = Alignment.M_COMPACT_SPLIT;
	this.formatterPrefs.use_tabs_only_for_leading_indentations = true;
	setPageWidth80();
	String source = 
		"package p;\n" + 
		"\n" + 
		"public enum TestEnum {\n" + 
		"	ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, TEN, ELEVEN, TWELWE, THIRTEEN, FOURTEEN, FIFTEEN;\n" + 
		"}";
	formatSource(source,
		"package p;\n" + 
		"\n" + 
		"public enum TestEnum {\n" + 
		"	ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, TEN, ELEVEN, TWELWE,\n" + 
		"	THIRTEEN, FOURTEEN, FIFTEEN;\n" + 
		"}"
	);
}
}

Lines 1-114 Link Here

(-)a/org.eclipse.jdt.core/eclipse.jdt.ui.patch.txt (-4 lines)
1	### Eclipse Workspace Patch 1.0
2	#P org.eclipse.jdt.ui
3	diff --git ui/org/eclipse/jdt/internal/ui/preferences/formatter/IndentationTabPage.java ui/org/eclipse/jdt/internal/ui/preferences/formatter/IndentationTabPage.java
4	index bbcb3bb..949bf62 100644

Lines 11-16 Link Here

(-)a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java (-1 / +2 lines)
11	* bug 404146 - [1.7][compiler] nested try-catch-finally-blocks leads to unrunnable Java byte code	11	* bug 404146 - [1.7][compiler] nested try-catch-finally-blocks leads to unrunnable Java byte code
12	* Harry Terkelsen (het@google.com) - Bug 449262 - Allow the use of third-party Java formatters	12	* Harry Terkelsen (het@google.com) - Bug 449262 - Allow the use of third-party Java formatters
13	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519	13	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
		14	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
14	*******************************************************************************/	15	*******************************************************************************/
15	package org.eclipse.jdt.internal.formatter;	16	package org.eclipse.jdt.internal.formatter;
16		17
Lines 369-375 Link Here
369	private void prepareWraps(int kind) {	370	private void prepareWraps(int kind) {
370	WrapPreparator wrapPreparator = new WrapPreparator(this.tokenManager, this.workingOptions, kind);	371	WrapPreparator wrapPreparator = new WrapPreparator(this.tokenManager, this.workingOptions, kind);
371	this.astRoot.accept(wrapPreparator);	372	this.astRoot.accept(wrapPreparator);
372	wrapPreparator.finishUp();	373	wrapPreparator.finishUp(this.astRoot);
373	}	374	}
374		375
375	/**	376	/**




 * Contributors:
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] IndexOutOfBoundsException in TokenManager - https://bugs.eclipse.org/462945
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
 *******************************************************************************/
package org.eclipse.jdt.internal.formatter;


import org.eclipse.jdt.core.dom.Modifier;
import org.eclipse.jdt.core.dom.NormalAnnotation;
import org.eclipse.jdt.core.dom.PackageDeclaration;
import org.eclipse.jdt.core.dom.ReturnStatement;
import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
import org.eclipse.jdt.core.dom.Statement;

		handleBracedCode(node, node.getExpression(), this.options.brace_position_for_switch,
				this.options.indent_switchstatements_compare_to_switch, true);

		List<Statement> statements = node.statements();
		if (this.options.indent_switchstatements_compare_to_cases) {
			int nonBreakStatementEnd = -1;
			for (Statement statement : statements) {
				if (statement instanceof SwitchCase) {
					if (nonBreakStatementEnd >= 0) {
						// indent only comments between previous and current statement
						this.tm.get(nonBreakStatementEnd + 1).indent();
						this.tm.firstTokenIn(statement, -1).unindent();
					}
				} else if (!(statement instanceof BreakStatement || statement instanceof Block)) {
					indent(statement);
				}
				nonBreakStatementEnd = (statement instanceof BreakStatement || statement instanceof ReturnStatement)
						? -1 : this.tm.lastIndexIn(statement, -1);
			}
			if (nonBreakStatementEnd >= 0) {
				// indent comments between last statement and closing brace 
				this.tm.get(nonBreakStatementEnd + 1).indent();
				this.tm.lastTokenIn(node, TokenNameRBRACE).unindent();
			}
		}
		if (this.options.indent_breaks_compare_to_cases) {
			for (Statement statement : statements) {
				if (statement instanceof BreakStatement)
					indent(statement);
			}
		}

		boolean isBreakStatement = false;
		List<Statement> statements = node.statements();
		for (Statement statement : statements) {
			if (isBreakStatement) // actually, was break statement
				this.tm.firstTokenIn(statement, -1).indent();
			isBreakStatement = statement instanceof BreakStatement;
			if (this.options.indent_switchstatements_compare_to_cases
					&& (isBreakStatement || statement instanceof SwitchCase || statement instanceof Block)) {
				unindent(statement);
			}
			if (statement instanceof Block)
				continue; // will add break in visit(Block) if necessary
			if (this.options.put_empty_statement_on_new_line || !(statement instanceof EmptyStatement))
				breakLineBefore(statement);
			if (isBreakStatement) {
				if (this.options.indent_breaks_compare_to_cases)
					indent(statement);
				this.tm.firstTokenAfter(statement, -1).unindent();
			}
		}
		if (isBreakStatement) // actually, was break statement
			this.tm.lastTokenIn(node, -1).indent();

		return true;
	}


	private void indent(ASTNode node) {
		int startIndex = this.tm.firstIndexIn(node, -1);
		while (startIndex > 0 && this.tm.get(startIndex - 1).isComment())
				&& !(node.getParent() instanceof SwitchStatement))
			startIndex--;
		this.tm.get(startIndex).indent();
		int lastIndex = this.tm.lastIndexIn(node, -1);
		if (lastIndex + 1 < this.tm.size())
			this.tm.get(lastIndex + 1).unindent();
	}

	private void unindent(ASTNode node) {
		int startIndex = this.tm.firstIndexIn(node, -1);
		// no symmetry with indent(): unindent is only used in switch statement
		// and should not include preceding comments
		this.tm.get(startIndex).unindent();
		int lastIndex = this.tm.lastIndexIn(node, -1);
		if (lastIndex + 1 < this.tm.size())
			this.tm.get(lastIndex + 1).indent();
	}

	public void finishUp() {

Lines 8-13 Link Here

(-)a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/SpacePreparator.java (-3 / +6 lines)
8	* Contributors:	8	* Contributors:
9	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519	9	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
10	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] IndexOutOfBoundsException in TokenManager - https://bugs.eclipse.org/462945	10	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] IndexOutOfBoundsException in TokenManager - https://bugs.eclipse.org/462945
		11	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jdt.internal.formatter;	13	package org.eclipse.jdt.internal.formatter;
13		14
Lines 497-505 Link Here
497	handleToken(node, TokenNameLBRACE, this.options.insert_space_before_opening_brace_in_block, false);	498	handleToken(node, TokenNameLBRACE, this.options.insert_space_before_opening_brace_in_block, false);
498	if (this.options.insert_space_after_closing_brace_in_block) {	499	if (this.options.insert_space_after_closing_brace_in_block) {
499	int closeBraceIndex = this.tm.lastIndexIn(node, TokenNameRBRACE);	500	int closeBraceIndex = this.tm.lastIndexIn(node, TokenNameRBRACE);
500	if (closeBraceIndex + 1 < this.tm.size()	501	if (closeBraceIndex + 1 < this.tm.size()) {
501	&& this.tm.get(closeBraceIndex + 1).tokenType != TokenNameSEMICOLON)	502	int nextToken = this.tm.get(closeBraceIndex + 1).tokenType;
502	this.tm.get(closeBraceIndex).spaceAfter();	503	if (nextToken != TokenNameSEMICOLON && nextToken != TokenNameRPAREN)
		504	this.tm.get(closeBraceIndex).spaceAfter();
		505	}
503	}	506	}
504	return true;	507	return true;
505	}	508	}

Lines 7-12 Link Here

(-)a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/linewrap/WrapExecutor.java (-1 / +2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519	9	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
		10	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.formatter.linewrap;	12	package org.eclipse.jdt.internal.formatter.linewrap;
12		13
Lines 631-637 Link Here
631		632
632	int getWrapIndent(Token token) {	633	int getWrapIndent(Token token) {
633	WrapPolicy policy = token.getWrapPolicy();	634	WrapPolicy policy = token.getWrapPolicy();
634	if (policy == null \|\| (token.getLineBreaksBefore() > 1 && !policy.isForced))	635	if (policy == null \|\| (token.getLineBreaksBefore() > 1 && !policy.isForced && !policy.isTopPriority()))
635	return token.getIndent(); // no additional indentation after an empty line	636	return token.getIndent(); // no additional indentation after an empty line
636		637
637	if (this.options.never_indent_line_comments_on_first_column && token.tokenType == TokenNameCOMMENT_LINE	638	if (this.options.never_indent_line_comments_on_first_column && token.tokenType == TokenNameCOMMENT_LINE




 *
 * Contributors:
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
 *     Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
 *******************************************************************************/
package org.eclipse.jdt.internal.formatter.linewrap;


import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameLPAREN;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameOR;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameQUESTION;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameRBRACE;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameRPAREN;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameStringLiteral;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameextends;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameimplements;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNameIdentifier;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNamenew;
import static org.eclipse.jdt.internal.compiler.parser.TerminalTokens.TokenNamethrows;


			if (operand instanceof InfixExpression && samePrecedence(node, (InfixExpression) operand)) {
				findTokensToWrap((InfixExpression) operand, depth + 1);
			}
			int indexBefore = this.tm.firstIndexBefore(operand, -1);
			while (this.tm.get(indexBefore).isComment())
				indexBefore--;
			assert node.getOperator().toString().equals(this.tm.toString(indexBefore));
			int indexAfter = this.tm.firstIndexIn(operand, -1);
			this.wrapIndexes.add(this.options.wrap_before_binary_operator ? indexBefore : indexAfter);

			if (!this.options.join_wrapped_lines) {
				// TODO there should be an option for never joining wraps on opposite side of the operator
				if (this.options.wrap_before_binary_operator) {
					if (this.tm.countLineBreaksBetween(this.tm.get(indexAfter - 1), this.tm.get(indexAfter)) > 0)
						this.wrapIndexes.add(indexAfter);
				} else {
					if (this.tm.countLineBreaksBetween(this.tm.get(indexBefore), this.tm.get(indexBefore - 1)) > 0)
						this.wrapIndexes.add(indexBefore);
				}
			}
		}
	}

			this.wrapParentIndex = this.tm.firstIndexBefore(expressions.get(0), TokenNameLBRACE);
			this.wrapGroupEnd = this.tm.lastIndexIn(node, -1);
			handleWrap(this.options.alignment_for_expressions_in_array_initializer, node);
		}
		if (!this.options.join_wrapped_lines
				&& !this.options.insert_new_line_before_closing_brace_in_array_initializer) {
			// if there is a line break before the closing brace, formatter should treat it as a valid wrap to preserve
			int closingBraceIndex = this.tm.lastIndexIn(node, TokenNameRBRACE);
			Token closingBrace = this.tm.get(closingBraceIndex);
			if (this.tm.countLineBreaksBetween(this.tm.get(closingBraceIndex - 1), closingBrace) == 1) {
				int openingBraceIndex = this.tm.firstIndexIn(node, TokenNameLBRACE);
				closingBrace.setWrapPolicy(
						new WrapPolicy(0, openingBraceIndex, this.currentDepth, 1, true, false, -1, false));
			}
		}
		return true;
	}

				indentOnColumn, topPriorityGroupEnd, false);
	}

	public void finishUp(ASTNode astRoot) {
		preserveExistingLineBreaks();
		new WrapExecutor(this.tm, this.options).executeWraps();
		if (this.fieldAligner != null)
			this.fieldAligner.alignComments();
		wrapComments();
		fixEnumConstantIndents(astRoot);
	}

	private void preserveExistingLineBreaks() {

			}
		}
	}

	private void fixEnumConstantIndents(ASTNode astRoot) {
		if (this.options.use_tabs_only_for_leading_indentations) {
			// enum constants should be indented like other declarations, not like wrapped elements
			astRoot.accept(new ASTVisitor() {

				@Override
				public boolean visit(EnumConstantDeclaration node) {
					WrapPreparator.this.tm.firstTokenIn(node, TokenNameIdentifier).setWrapPolicy(null);
					return true;
				}
			});
		}
	}
}

Return to bug 458208

Lines 11-16 Link Here

(-)a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java (-30 / +198 lines)
11	* Robin Stocker - Bug 49619 - [formatting] comment formatter leaves whitespace in comments	11	* Robin Stocker - Bug 49619 - [formatting] comment formatter leaves whitespace in comments
12	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519	12	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] Formatter does not format Java code correctly, especially when max line width is set - https://bugs.eclipse.org/303519
13	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] IndexOutOfBoundsException in TokenManager - https://bugs.eclipse.org/462945	13	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] IndexOutOfBoundsException in TokenManager - https://bugs.eclipse.org/462945
		14	* Mateusz Matela <mateusz.matela@gmail.com> - [formatter] follow up bug for comments - https://bugs.eclipse.org/458208
14	*******************************************************************************/	15	*******************************************************************************/
15	package org.eclipse.jdt.core.tests.formatter;	16	package org.eclipse.jdt.core.tests.formatter;
16		17
Lines 1372-1378 Link Here
1372	// see also bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=287462	1373	// see also bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=287462
1373	public void testBug198074_dup201022() throws JavaModelException {	1374	public void testBug198074_dup201022() throws JavaModelException {
1374	this.formatterPrefs.join_wrapped_lines = false;	1375	this.formatterPrefs.join_wrapped_lines = false;
1375	this.formatterPrefs.wrap_before_binary_operator = false;
1376	String source =	1376	String source =
1377	"public class Test {\n" +	1377	"public class Test {\n" +
1378	"\n" +	1378	"\n" +
Lines 1399-1405 Link Here
1399	// duplicate bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=213700	1399	// duplicate bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=213700
1400	public void testBug198074_dup213700() throws JavaModelException {	1400	public void testBug198074_dup213700() throws JavaModelException {
1401	this.formatterPrefs.join_wrapped_lines = false;	1401	this.formatterPrefs.join_wrapped_lines = false;
1402	this.formatterPrefs.wrap_before_binary_operator = false;
1403	String source =	1402	String source =
1404	"public class Test {\n" +	1403	"public class Test {\n" +
1405	"\n" +	1404	"\n" +
Lines 1906-1912 Link Here
1906	"@MessageDriven(mappedName = \"filiality/SchedulerMQService\",\n" +	1905	"@MessageDriven(mappedName = \"filiality/SchedulerMQService\",\n" +
1907	" activationConfig = {\n" +	1906	" activationConfig = {\n" +
1908	" @ActivationConfigProperty(propertyName = \"cronTrigger\",\n" +	1907	" @ActivationConfigProperty(propertyName = \"cronTrigger\",\n" +
1909	" propertyValue = \"0/10 * * * * ?\") })\n" +	1908	" propertyValue = \"0/10 * * * * ?\")\n" +
		1909	" })\n" +
1910	"@RunAs(\"admin\")\n" +	1910	"@RunAs(\"admin\")\n" +
1911	"@ResourceAdapter(\"quartz-ra.rar\")\n" +	1911	"@ResourceAdapter(\"quartz-ra.rar\")\n" +
1912	"@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +	1912	"@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)\n" +
Lines 8041-8049 Link Here
8041	"public class X07 {\n" +	8041	"public class X07 {\n" +
8042	"\n" +	8042	"\n" +
8043	" static final long[] jjtoToken = {\n" +	8043	" static final long[] jjtoToken = {\n" +
8044	" 0x7fbfecffL, };\n" +	8044	" 0x7fbfecffL,\n" +
		8045	" };\n" +
8045	" static final long[] jjtoSkip = {\n" +	8046	" static final long[] jjtoSkip = {\n" +
8046	" 0x400000L, };\n" +	8047	" 0x400000L,\n" +
		8048	" };\n" +
8047	"\n" +	8049	"\n" +
8048	"}\n"	8050	"}\n"
8049	);	8051	);
Lines 8072-8081 Link Here
8072	"\n" +	8074	"\n" +
8073	" static final long[] jjtoToken =\n" +	8075	" static final long[] jjtoToken =\n" +
8074	" {\n" +	8076	" {\n" +
8075	" 0x7fbfecffL, };\n" +	8077	" 0x7fbfecffL,\n" +
		8078	" };\n" +
8076	" static final long[] jjtoSkip =\n" +	8079	" static final long[] jjtoSkip =\n" +
8077	" {\n" +	8080	" {\n" +
8078	" 0x400000L, };\n" +	8081	" 0x400000L,\n" +
		8082	" };\n" +
8079	"\n" +	8083	"\n" +
8080	"}\n"	8084	"}\n"
8081	);	8085	);
Lines 8124-8130 Link Here
8124	"public class X09 {\n" +	8128	"public class X09 {\n" +
8125	" public Class[] getAdapterList() {\n" +	8129	" public Class[] getAdapterList() {\n" +
8126	" return new Class[] {\n" +	8130	" return new Class[] {\n" +
8127	" IWorkbenchAdapter.class };\n" +	8131	" IWorkbenchAdapter.class\n" +
		8132	" };\n" +
8128	" }\n" +	8133	" }\n" +
8129	"}\n"	8134	"}\n"
8130	);	8135	);
Lines 8796-8802 Link Here
8796	}	8801	}
8797	public void testBug330313_wksp1_25_njl() {	8802	public void testBug330313_wksp1_25_njl() {
8798	this.formatterPrefs.join_wrapped_lines = false;	8803	this.formatterPrefs.join_wrapped_lines = false;
8799	this.formatterPrefs.wrap_before_binary_operator = false;
8800	String source =	8804	String source =
8801	"package wksp1;\n" +	8805	"package wksp1;\n" +
8802	"\n" +	8806	"\n" +
Lines 8811-8817 Link Here
8811	}	8815	}
8812	public void testBug330313_wksp1_26_njl() {	8816	public void testBug330313_wksp1_26_njl() {
8813	this.formatterPrefs.join_wrapped_lines = false;	8817	this.formatterPrefs.join_wrapped_lines = false;
8814	this.formatterPrefs.wrap_before_binary_operator = false;
8815	String source =	8818	String source =
8816	"package wksp1;\n" +	8819	"package wksp1;\n" +
8817	"\n" +	8820	"\n" +
Lines 8962-8968 Link Here
8962	}	8965	}
8963	public void testBug330313_wksp1_30_njl() {	8966	public void testBug330313_wksp1_30_njl() {
8964	this.formatterPrefs.join_wrapped_lines = false;	8967	this.formatterPrefs.join_wrapped_lines = false;
8965	this.formatterPrefs.wrap_before_binary_operator = false;
8966	setPageWidth80();	8968	setPageWidth80();
8967	String source =	8969	String source =
8968	"package wksp1;\n" +	8970	"package wksp1;\n" +
Lines 9083-9089 Link Here
9083	}	9085	}
9084	public void testBug330313_wksp1_33_njl() {	9086	public void testBug330313_wksp1_33_njl() {
9085	this.formatterPrefs.join_wrapped_lines = false;	9087	this.formatterPrefs.join_wrapped_lines = false;
9086	this.formatterPrefs.wrap_before_binary_operator = false;
9087	String source =	9088	String source =
9088	"package wksp1;\n" +	9089	"package wksp1;\n" +
9089	"\n" +	9090	"\n" +
Lines 9106-9113 Link Here
9106	" void foo() {\n" +	9107	" void foo() {\n" +
9107	" if (inMetaTag &&\n" +	9108	" if (inMetaTag &&\n" +
9108	" (t1.image.equalsIgnoreCase(\"name\") \|\|\n" +	9109	" (t1.image.equalsIgnoreCase(\"name\") \|\|\n" +
9109	" t1.image.equalsIgnoreCase(\"HTTP-EQUIV\")) &&\n" +	9110	" t1.image.equalsIgnoreCase(\"HTTP-EQUIV\"))\n" +
9110	" t2 != null) {\n" +	9111	" && t2 != null) {\n" +
9111	" currentMetaTag = t2.image.toLowerCase();\n" +	9112	" currentMetaTag = t2.image.toLowerCase();\n" +
9112	" }\n" +	9113	" }\n" +
9113	" }\n" +	9114	" }\n" +
Lines 9305-9311 Link Here
9305	" * \"GeneralPage.DoubleClick\", resName, 1,\n" +	9306	" * \"GeneralPage.DoubleClick\", resName, 1,\n" +
9306	" * new String[][] {\n" +	9307	" * new String[][] {\n" +
9307	" * { \"Open Browser\", \"open\" },\n" +	9308	" * { \"Open Browser\", \"open\" },\n" +
9308	" * { \"Expand Tree\", \"expand\" } },\n" +	9309	" * { \"Expand Tree\", \"expand\" }\n" +
		9310	" * },\n" +
9309	" * parent);\n" +	9311	" * parent);\n" +
9310	" * </pre>\n" +	9312	" * </pre>\n" +
9311	" */\n" +	9313	" */\n" +
Lines 9337-9343 Link Here
9337	" /* INACTIVE */ { \"INACTIVE\", \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\" },\n" +	9339	" /* INACTIVE */ { \"INACTIVE\", \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\" },\n" +
9338	" /* PARTLY_ACTIVE */ { \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\",\n" +	9340	" /* PARTLY_ACTIVE */ { \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\",\n" +
9339	" \"PARTLY_ACTIVE\" },\n" +	9341	" \"PARTLY_ACTIVE\" },\n" +
9340	" /* ACTIVE */ { \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\", \"ACTIVE\" } };\n" +	9342	" /* ACTIVE */ { \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\", \"ACTIVE\" }\n" +
		9343	" };\n" +
9341	"}\n"	9344	"}\n"
9342	);	9345	);
9343	}	9346	}
Lines 9508-9514 Link Here
9508	" user,\n" +	9511	" user,\n" +
9509	" revision,\n" +	9512	" revision,\n" +
9510	" String.valueOf(delta),\n" +	9513	" String.valueOf(delta),\n" +
9511	" line });\n" +	9514	" line\n" +
		9515	" });\n" +
9512	" }\n" +	9516	" }\n" +
9513	"}\n"	9517	"}\n"
9514	);	9518	);
Lines 9611-9617 Link Here
9611	" IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" +	9615	" IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" +
9612	" new Color[] {\n" +	9616	" new Color[] {\n" +
9613	" colorRegistry.get(\n" +	9617	" colorRegistry.get(\n" +
9614	" IWorkbenchThemeConstants.INACTIVE_TAB_BG_START) },\n" +	9618	" IWorkbenchThemeConstants.INACTIVE_TAB_BG_START)\n" +
		9619	" },\n" +
9615	" new int[0],\n" +	9620	" new int[0],\n" +
9616	" true);\n" +	9621	" true);\n" +
9617	" }\n" +	9622	" }\n" +
Lines 9780-9786 Link Here
9780	" public char[][] getCompoundName() {\n" +	9785	" public char[][] getCompoundName() {\n" +
9781	" return EvaluationConstants.ROOT_COMPOUND_NAME;\n" +	9786	" return EvaluationConstants.ROOT_COMPOUND_NAME;\n" +
9782	" }\n" +	9787	" }\n" +
9783	" } },\n" +	9788	" }\n" +
		9789	" },\n" +
9784	" null);\n" +	9790	" null);\n" +
9785	" }\n" +	9791	" }\n" +
9786	" }\n" +	9792	" }\n" +
Lines 9985-9991 Link Here
9985	" return info.getLocal()\n" +	9991	" return info.getLocal()\n" +
9986	" .getType() == IResource.FILE;\n" +	9992	" .getType() == IResource.FILE;\n" +
9987	" }\n" +	9993	" }\n" +
9988	" } }),\n" +	9994	" }\n" +
		9995	" }),\n" +
9989	" // Conflicting changes of files will fail if the local is not\n" +	9996	" // Conflicting changes of files will fail if the local is not\n" +
9990	" // managed\n" +	9997	" // managed\n" +
9991	" // or is an addition\n" +	9998	" // or is an addition\n" +
Lines 10012-10018 Link Here
10012	" }\n" +	10019	" }\n" +
10013	" return false;\n" +	10020	" return false;\n" +
10014	" }\n" +	10021	" }\n" +
10015	" } }),\n" +	10022	" }\n" +
		10023	" }),\n" +
10016	" // Conflicting changes involving a deletion on one side will\n" +	10024	" // Conflicting changes involving a deletion on one side will\n" +
10017	" // aways fail\n" +	10025	" // aways fail\n" +
10018	" new AndSyncInfoFilter(new FastSyncInfoFilter[] {\n" +	10026	" new AndSyncInfoFilter(new FastSyncInfoFilter[] {\n" +
Lines 10031-10037 Link Here
10031	" && !base.equals(remote));\n" +	10039	" && !base.equals(remote));\n" +
10032	" }\n" +	10040	" }\n" +
10033	" }\n" +	10041	" }\n" +
10034	" } }),\n" +	10042	" }\n" +
		10043	" }),\n" +
10035	" // Conflicts where the file type is binary will work but are not\n" +	10044	" // Conflicts where the file type is binary will work but are not\n" +
10036	" // merged\n" +	10045	" // merged\n" +
10037	" // so they should be skipped\n" +	10046	" // so they should be skipped\n" +
Lines 10060-10068 Link Here
10060	" }\n" +	10069	" }\n" +
10061	" return false;\n" +	10070	" return false;\n" +
10062	" }\n" +	10071	" }\n" +
10063	" } }),\n" +	10072	" }\n" +
		10073	" }),\n" +
10064	" // Outgoing changes may not fail but they are skipped as well\n" +	10074	" // Outgoing changes may not fail but they are skipped as well\n" +
10065	" new SyncInfoDirectionFilter(SyncInfo.OUTGOING) });\n" +	10075	" new SyncInfoDirectionFilter(SyncInfo.OUTGOING)\n" +
		10076	" });\n" +
10066	" }\n" +	10077	" }\n" +
10067	"}\n"	10078	"}\n"
10068	);	10079	);
Lines 10113-10119 Link Here
10113	" { 104, 20 },\n" +	10124	" { 104, 20 },\n" +
10114	" { 108, 21 },\n" +	10125	" { 108, 21 },\n" +
10115	" { 12, 1856 },\n" +	10126	" { 12, 1856 },\n" +
10116	" { 13, 1920 } }, };\n" +	10127	" { 13, 1920 } },\n" +
		10128	" };\n" +
10117	"}\n"	10129	"}\n"
10118	);	10130	);
10119	}	10131	}
Lines 10254-10260 Link Here
10254	" UNKNOWN,\n" +	10266	" UNKNOWN,\n" +
10255	" UNKNOWN,\n" +	10267	" UNKNOWN,\n" +
10256	" UNKNOWN,\n" +	10268	" UNKNOWN,\n" +
10257	" UNKNOWN } };\n" +	10269	" UNKNOWN }\n" +
		10270	" };\n" +
10258	"\n" +	10271	"\n" +
10259	"}\n"	10272	"}\n"
10260	);	10273	);
Lines 10300-10306 Link Here
10300	" \"READ_POTENTIAL\",\n" +	10313	" \"READ_POTENTIAL\",\n" +
10301	" \"UNKNOWN\",\n" +	10314	" \"UNKNOWN\",\n" +
10302	" \"UNKNOWN\",\n" +	10315	" \"UNKNOWN\",\n" +
10303	" \"UNKNOWN\" }, };\n" +	10316	" \"UNKNOWN\" },\n" +
		10317	" };\n" +
10304	"\n" +	10318	"\n" +
10305	"}\n"	10319	"}\n"
10306	);	10320	);
Lines 10348-10354 Link Here
10348	" \"READ_POTENTIAL\",\n" +	10362	" \"READ_POTENTIAL\",\n" +
10349	" \"UNKNOWN\",\n" +	10363	" \"UNKNOWN\",\n" +
10350	" \"UNKNOWN\",\n" +	10364	" \"UNKNOWN\",\n" +
10351	" \"UNKNOWN\" }, };\n" +	10365	" \"UNKNOWN\" },\n" +
		10366	" };\n" +
10352	"\n" +	10367	"\n" +
10353	"}\n"	10368	"}\n"
10354	);	10369	);
Lines 10389-10395 Link Here
10389	" \"1234567890123456789012345678901234567890\" },\n" +	10404	" \"1234567890123456789012345678901234567890\" },\n" +
10390	" /* Comment 3 */ {\n" +	10405	" /* Comment 3 */ {\n" +
10391	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\",\n" +	10406	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\",\n" +
10392	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\" }, };\n" +	10407	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\" },\n" +
		10408	" };\n" +
10393	"\n" +	10409	"\n" +
10394	"}\n"	10410	"}\n"
10395	);	10411	);
Lines 10720-10724 Link Here
10720	String source = "/**/int f;";	10736	String source = "/**/int f;";
10721	formatSource(source, source, CodeFormatter.K_STATEMENTS);	10737	formatSource(source, source, CodeFormatter.K_STATEMENTS);
10722	}	10738	}
10723		10739	/**
		10740	* @bug 458208: [formatter] follow up bug for comments
		10741	* @test test a space is not added after a lambda expression in parenthesis
		10742	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c2"
		10743	*/
		10744	public void testBug458208() throws Exception {
		10745	String source =
		10746	"package p;\n" +
		10747	"import java.util.function.IntConsumer;\n" +
		10748	"class TestInlineLambda1 {\n" +
		10749	" {\n" +
		10750	" IntConsumer op = (x -> {} );\n" +
		10751	" }\n" +
		10752	"}\n";
		10753	formatSource(source,
		10754	"package p;\n" +
		10755	"\n" +
		10756	"import java.util.function.IntConsumer;\n" +
		10757	"\n" +
		10758	"class TestInlineLambda1 {\n" +
		10759	" {\n" +
		10760	" IntConsumer op = (x -> {\n" +
		10761	" });\n" +
		10762	" }\n" +
		10763	"}\n"
		10764	);
		10765	}
		10766	/**
		10767	* @bug 458208: [formatter] follow up bug for comments
		10768	* @test test that comments in switch statements are properly indented
		10769	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c21"
		10770	*/
		10771	public void testBug458208b() throws Exception {
		10772	formatSource(
		10773	"package p;\n" +
		10774	"\n" +
		10775	"public class C1 {\n" +
		10776	" void foo(int x) {\n" +
		10777	" switch (x) {\n" +
		10778	" // case 1\n" +
		10779	" case 1:\n" +
		10780	" break;\n" +
		10781	" // case 2\n" +
		10782	" case 2:\n" +
		10783	" break;\n" +
		10784	" // no more cases\n" +
		10785	" }\n" +
		10786	" }\n" +
		10787	"\n" +
		10788	" int bar(int x) {\n" +
		10789	" while (true) {\n" +
		10790	" int y = 9;\n" +
		10791	" switch (x) {\n" +
		10792	" // case 1\n" +
		10793	" case 1:\n" +
		10794	" // should return\n" +
		10795	" return y;\n" +
		10796	" // case 2\n" +
		10797	" case 2:\n" +
		10798	" // should break\n" +
		10799	" break;\n" +
		10800	" case 3:\n" +
		10801	" // TODO\n" +
		10802	" }\n" +
		10803	" }\n" +
10804	" }\n" +
10805	"}\n"
10806	);
10807	}
10808	/**
10809	* @bug 458208: [formatter] follow up bug for comments
10810	* @test test that elements separated with empty lines are properly indented
10811	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c18"
10812	*/
10813	public void testBug458208c() throws Exception {
10814	final int wrapAllOnColumn = Alignment.M_NEXT_PER_LINE_SPLIT + Alignment.M_INDENT_ON_COLUMN + Alignment.M_FORCE;
10815	this.formatterPrefs.alignment_for_enum_constants = wrapAllOnColumn;
10816	this.formatterPrefs.alignment_for_arguments_in_enum_constant = wrapAllOnColumn;
10817	this.formatterPrefs.alignment_for_expressions_in_array_initializer = wrapAllOnColumn;
10818	String source =
10819	"package p;\n" +
10820	"\n" +
10821	"public enum TestEnum {\n" +
10822	" FIRST_ENUM(\"first type\",\n" +
10823	" new SomeClass(),\n" +
10824	" new OtherEnumType[] { OtherEnumType.FOO }),\n" +
10825	"\n" +
10826	" SECOND_ENUM(\"second type\",\n" +
10827	" new SomeClassOtherClass(),\n" +
10828	" new OtherEnumType[] { OtherEnumType.BAR }),\n" +
10829	"\n" +
10830	" THIRD_ENUM(\"third type\",\n" +
10831	" new YetAnotherClass(),\n" +
10832	" new OtherEnumType[] { OtherEnumType.FOOBAR,\n" +
10833	" OtherEnumType.FOOBARBAZ,\n" +
10834	"\n" +
10835	" OtherEnumType.LONGERFOOBARBAZ,\n" +
10836	" OtherEnumType.MORELETTERSINHERE });\n" +
10837	"\n" +
10838	" /* data members and methods go here */\n" +
10839	" TestEnum(String s, Cls s1, OtherEnumType[] e) {\n" +
10840	" }\n" +
10841	"}";
10842	formatSource(source,
10843	"package p;\n" +
10844	"\n" +
10845	"public enum TestEnum {\n" +
10846	" FIRST_ENUM( \"first type\",\n" +
10847	" new SomeClass(),\n" +
10848	" new OtherEnumType[] { OtherEnumType.FOO }),\n" +
10849	"\n" +
10850	" SECOND_ENUM(\"second type\",\n" +
10851	" new SomeClassOtherClass(),\n" +
10852	" new OtherEnumType[] { OtherEnumType.BAR }),\n" +
10853	"\n" +
10854	" THIRD_ENUM( \"third type\",\n" +
10855	" new YetAnotherClass(),\n" +
10856	" new OtherEnumType[] { OtherEnumType.FOOBAR,\n" +
10857	" OtherEnumType.FOOBARBAZ,\n" +
10858	"\n" +
10859	" OtherEnumType.LONGERFOOBARBAZ,\n" +
10860	" OtherEnumType.MORELETTERSINHERE });\n" +
10861	"\n" +
10862	" /* data members and methods go here */\n" +
10863	" TestEnum(String s, Cls s1, OtherEnumType[] e) {\n" +
10864	" }\n" +
10865	"}"
10866	);
10867	}
10868	/**
10869	* @bug 458208: [formatter] follow up bug for comments
10870	* @test test that enum constants are not indented with spaces when "Use spaces to indent wrapped lines" is on
10871	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=458208#c24"
10872	*/
10873	public void testBug458208d() throws Exception {
10874	this.formatterPrefs.alignment_for_enum_constants = Alignment.M_COMPACT_SPLIT;
10875	this.formatterPrefs.use_tabs_only_for_leading_indentations = true;
10876	setPageWidth80();
10877	String source =
10878	"package p;\n" +
10879	"\n" +
10880	"public enum TestEnum {\n" +
10881	" ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, TEN, ELEVEN, TWELWE, THIRTEEN, FOURTEEN, FIFTEEN;\n" +
10882	"}";
10883	formatSource(source,
10884	"package p;\n" +
10885	"\n" +
10886	"public enum TestEnum {\n" +
10887	" ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, TEN, ELEVEN, TWELWE,\n" +
10888	" THIRTEEN, FOURTEEN, FIFTEEN;\n" +
10889	"}"
10890	);
10891	}
10724	}	10892	}