Attachment #110305 for bug #244477

View | Details | Raw Unified | Return to bug 244477
Collapse All | Expand All




	private long time;

	static {
//		TESTS_NUMBERS = new int[] { 715 };
//		TESTS_RANGE = new int[] { 715, -1 };
	}
	public static Test suite() {
		return buildModelTestSuite(FormatterRegressionTests.class);

		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		runTest(codeFormatter, "test714", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
	public void test715() {
		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		preferences.keep_empty_array_initializer_on_one_line = true;
		preferences.insert_space_before_comma_in_array_initializer = false;
		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		runTest(codeFormatter, "test715", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
	public void test716() {
		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		preferences.keep_empty_array_initializer_on_one_line = true;
		preferences.insert_space_before_comma_in_array_initializer = true;
		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		runTest(codeFormatter, "test716", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
	public void test717() {
		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		preferences.keep_empty_array_initializer_on_one_line = false;
		preferences.insert_space_before_comma_in_array_initializer = false;
		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		runTest(codeFormatter, "test717", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
	public void test718() {
		final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		preferences.keep_empty_array_initializer_on_one_line = false;
		preferences.insert_space_before_comma_in_array_initializer = true;
		DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		runTest(codeFormatter, "test718", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
	}
}

Added Link Here

(-)workspace/Formatter/test718/A_out.java (+7 lines)
1	public class X {
2	final String[] empty = new String[] { ,};
3
4	public static void main(String[] args) {
5	}
6
7	}

Added Link Here

(-)workspace/Formatter/test717/A_out.java (+7 lines)
1	public class X {
2	final String[] empty = new String[] {,};
3
4	public static void main(String[] args) {
5	}
6
7	}

Added Link Here

(-)workspace/Formatter/test716/A_out.java (+7 lines)
1	public class X {
2	final String[] empty = new String[] { ,};
3
4	public static void main(String[] args) {
5	}
6
7	}

Added Link Here

(-)workspace/Formatter/test715/A_out.java (+7 lines)
1	public class X {
2	final String[] empty = new String[] {,};
3
4	public static void main(String[] args) {
5	}
6
7	}

Added Link Here

(-)workspace/Formatter/test715/A_in.java (+6 lines)
1	public class X { final String[] empty =
2	new String[] {,};
3	public static void main(String[] args) {
4	}
5
6	}

Added Link Here

(-)workspace/Formatter/test716/A_in.java (+6 lines)
1	public class X { final String[] empty =
2	new String[] {,};
3	public static void main(String[] args) {
4	}
5
6	}

Added Link Here

(-)workspace/Formatter/test717/A_in.java (+6 lines)
1	public class X { final String[] empty =
2	new String[] {,};
3	public static void main(String[] args) {
4	}
5
6	}

Added Link Here

(-)workspace/Formatter/test718/A_in.java (+6 lines)
1	public class X { final String[] empty =
2	new String[] {,};
3	public static void main(String[] args) {
4	}
5
6	}

Lines 2598-2606 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java (+8 lines)
2598	String array_initializer_brace_position = this.preferences.brace_position_for_array_initializer;	2598	String array_initializer_brace_position = this.preferences.brace_position_for_array_initializer;
2599	if (keepEmptyArrayInitializerOnTheSameLine) {	2599	if (keepEmptyArrayInitializerOnTheSameLine) {
2600	this.scribe.printNextToken(TerminalTokens.TokenNameLBRACE, this.preferences.insert_space_before_opening_brace_in_array_initializer);	2600	this.scribe.printNextToken(TerminalTokens.TokenNameLBRACE, this.preferences.insert_space_before_opening_brace_in_array_initializer);
		2601	if (isNextToken(TerminalTokens.TokenNameCOMMA)) {
		2602	this.scribe.printNextToken(TerminalTokens.TokenNameCOMMA, this.preferences.insert_space_before_comma_in_array_initializer);
		2603	this.scribe.printTrailingComment();
		2604	}
2601	this.scribe.printNextToken(TerminalTokens.TokenNameRBRACE, this.preferences.insert_space_between_empty_braces_in_array_initializer);	2605	this.scribe.printNextToken(TerminalTokens.TokenNameRBRACE, this.preferences.insert_space_between_empty_braces_in_array_initializer);
2602	} else {	2606	} else {
2603	formatOpeningBrace(array_initializer_brace_position, this.preferences.insert_space_before_opening_brace_in_array_initializer);	2607	formatOpeningBrace(array_initializer_brace_position, this.preferences.insert_space_before_opening_brace_in_array_initializer);
		2608	if (isNextToken(TerminalTokens.TokenNameCOMMA)) {
		2609	this.scribe.printNextToken(TerminalTokens.TokenNameCOMMA, this.preferences.insert_space_before_comma_in_array_initializer);
		2610	this.scribe.printTrailingComment();
		2611	}
2604	this.scribe.printNextToken(TerminalTokens.TokenNameRBRACE, false);	2612	this.scribe.printNextToken(TerminalTokens.TokenNameRBRACE, false);
2605	if (array_initializer_brace_position.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED)) {	2613	if (array_initializer_brace_position.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED)) {
2606	this.scribe.unIndent();	2614	this.scribe.unIndent();

Return to bug 244477

Lines 55-62 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java (-2 / +38 lines)
55	private long time;	55	private long time;
56		56
57	static {	57	static {
58	// TESTS_NUMBERS = new int[] { 669 };	58	// TESTS_NUMBERS = new int[] { 715 };
59	// TESTS_RANGE = new int[] { 658, -1 };	59	// TESTS_RANGE = new int[] { 715, -1 };
60	}	60	}
61	public static Test suite() {	61	public static Test suite() {
62	return buildModelTestSuite(FormatterRegressionTests.class);	62	return buildModelTestSuite(FormatterRegressionTests.class);
Lines 10142-10145 Link Here
10142	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);	10142	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
10143	runTest(codeFormatter, "test714", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$	10143	runTest(codeFormatter, "test714", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
10144	}	10144	}
		10145	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
		10146	public void test715() {
		10147	final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		10148	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		10149	preferences.keep_empty_array_initializer_on_one_line = true;
		10150	preferences.insert_space_before_comma_in_array_initializer = false;
		10151	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		10152	runTest(codeFormatter, "test715", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
		10153	}
		10154	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
		10155	public void test716() {
		10156	final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		10157	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		10158	preferences.keep_empty_array_initializer_on_one_line = true;
		10159	preferences.insert_space_before_comma_in_array_initializer = true;
		10160	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		10161	runTest(codeFormatter, "test716", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
		10162	}
		10163	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
		10164	public void test717() {
		10165	final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		10166	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		10167	preferences.keep_empty_array_initializer_on_one_line = false;
		10168	preferences.insert_space_before_comma_in_array_initializer = false;
		10169	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		10170	runTest(codeFormatter, "test717", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
		10171	}
		10172	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244477
		10173	public void test718() {
		10174	final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		10175	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		10176	preferences.keep_empty_array_initializer_on_one_line = false;
		10177	preferences.insert_space_before_comma_in_array_initializer = true;
		10178	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		10179	runTest(codeFormatter, "test718", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
		10180	}
10145	}	10181	}