Attachment #213608 for bug #372801

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




		"public class Test {\n" +
		"\n" +
		"	String foo(boolean enabled) {\n" +
		"		if (enabled) {\n" +
		"		{\n" +
		"			// we need x\n" +
		"			// we need a select\n" +
		"			return \"select x \"\n" +

		"public class Test {\n" +
		"\n" +
		"    String foo(boolean enabled) {\n" +
		"        if (enabled) {\n" +
		"        {\n" +
		"            // we need x\n" +
		"            // we need a select\n" +
		"            return \"select x \"\n" +

// 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.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
	String source =
		"public class Test {\n" +
		"\n" +

 */
public void testBug281655() throws JavaModelException {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
	String source =
		"@MessageDriven(mappedName = \"filiality/SchedulerMQService\", \n" + 
		"        activationConfig = { \n" + 

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

 */
public void testBug286601() throws JavaModelException {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	String source =
		"public class Test\n" +
		"{\n" +

public void testBug286601c() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.brace_position_for_anonymous_type_declaration= DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	String source =
		"public class Test\n" +
		"{\n" +

}
public void testBug286601d() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_anonymous_type_declaration= DefaultCodeFormatterConstants.NEXT_LINE;
	String source =
		"public class Test\n" +

	formatSource(source,
		"package massive;\n" + 
		"\n" + 
		"public class X03 {\n" +
		"{\n" + 
		"\n" + 
		"	public void foo() throws NullPointerException {\n" + 
		"\n" + 

 */
public void testBug317039_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
	String source =
		"public class X01\n" + 
		"  {\n" + 

		"public class X02 {\n" + 
		"	public void testMethod(String currentTokenVal,\n" + 
		"			int[][] expectedTokenSequencesVal,\n" + 
		"			String[] tokenImageVal) {\n" + 
		"			)\n" +
		"	{\n" + 
		"	}\n" + 
		"}\n"
	);

}
public void testBug330313_wksp1_07_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
	String source =
		"package wksp1;\n" + 
		"\n" + 

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

}
public void testBug330313_wksp1_07_njl_bnl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
	setUpBracesPreferences(DefaultCodeFormatterConstants.NEXT_LINE);
	String source =
		"package wksp1;\n" + 

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

}
public void testBug330313_wksp1_08_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
	String source =
		"package wksp1;\n" + 
		"\n" + 

// testCompare1159_1: org.eclipse.debug.internal.ui.DebugUIPropertiesAdapterFactory
public void testBug330313_wksp1_09_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
	String source =
		"package wksp1;\n" + 
		"\n" + 

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

// testCompare1723_1: org.eclipse.jdt.internal.compiler.ast.DoubleLiteral
public void testBug330313_wksp1_10_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
	String source =
		"package wksp1;\n" + 
		"\n" + 

		"\n" + 
		"public class X11 {\n" + 
		"	X11() {\n" + 
		"		accessFlags &= ~(AccStrictfp\n" + 
		"				| AccProtected\n" + 
		"				| AccPrivate\n" + 
		"				| AccStatic\n" + 
		"				| AccSynchronized\n" + 
		"				| AccNative);\n" + 
		"						| AccNative);\n" + 
		"	}\n" + 
		"}\n"
	);

// Test case extracted from org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java
public void testBug330313_wksp1_20_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
	String source =
		"package wksp1;\n" + 
		"\n" + 

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

// Test case extracted from differences noticed with patch v33.txt
public void testBug330313_wksp1_38_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
	this.formatterPrefs.keep_else_statement_on_same_line = false;
	this.formatterPrefs.insert_new_line_before_else_in_if_statement = true;
	String source =
		"package wksp1;\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"
	);
}

}
public void testBug330313_wksp1_46_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
	String source =
		"package wksp1;\n" + 
		"\n" + 

		"	void foo() {\n" + 
		"		if (getActive() == StackPresentation.AS_ACTIVE_NOFOCUS) {\n" + 
		"			drawGradient(\n" + 
		"					colorRegistry.get(IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" + 
		"							.get(IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" + 
		"					new Color[] {\n" + 
		"						colorRegistry\n" + 
		"								.get(IWorkbenchThemeConstants.INACTIVE_TAB_BG_START)\n" + 
		"					},\n" + 
		"					new int[0],\n" + 
		"					true);\n" + 

}
public void testBug330313_wksp1_50_njl() {
	this.formatterPrefs.join_wrapped_lines = false;
	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
	String source =
		"package wksp1;\n" + 
		"\n" + 

		"			// Deploy CodeSnippet class (only once)\n" + 
		"			requestor.acceptClassFiles(\n" + 
		"					new ClassFile[] {\n" + 
		"						new ClassFile() {\n" + 
		"							public byte[] getBytes() {\n" + 
		"								return getCodeSnippetBytes();\n" + 
		"							}\n" + 
		"\n" + 
		"							public char[][] getCompoundName() {\n" + 
		"								return EvaluationConstants.ROOT_COMPOUND_NAME;\n" + 
		"							}\n" + 
		"						}\n" + 
		"					}\n" + 
		"					},\n" + 
		"					null);\n" + 
		"		}\n" + 

		"											.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" + 

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

		"					WRITE_POTENTIAL,\n" + 
		"					WRITE_POTENTIAL,\n" + 
		"					UNKNOWN },\n" + 
		"			/* UNKNOWN */{ UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN } };\n" + 
		// Should be slip but that has been broken since 3.4.2 (i.e. 3.3.2 is OK)
//		"			/* UNKNOWN */{\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"
	);

Return to bug 372801

Lines 1243-1250 Link Here

(-)a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java (-50 / +63 lines)
1243	"public class Test {\n" +	1243	"public class Test {\n" +
1244	"\n" +	1244	"\n" +
1245	" String foo(boolean enabled) {\n" +	1245	" String foo(boolean enabled) {\n" +
1246	" if (enabled)\n" +	1246	" if (enabled) {\n" +
1247	" {\n" +
1248	" // we need x\n" +	1247	" // we need x\n" +
1249	" // we need a select\n" +	1248	" // we need a select\n" +
1250	" return \"select x \"\n" +	1249	" return \"select x \"\n" +
Lines 1274-1281 Link Here
1274	"public class Test {\n" +	1273	"public class Test {\n" +
1275	"\n" +	1274	"\n" +
1276	" String foo(boolean enabled) {\n" +	1275	" String foo(boolean enabled) {\n" +
1277	" if (enabled)\n" +	1276	" if (enabled) {\n" +
1278	" {\n" +
1279	" // we need x\n" +	1277	" // we need x\n" +
1280	" // we need a select\n" +	1278	" // we need a select\n" +
1281	" return \"select x \"\n" +	1279	" return \"select x \"\n" +
Lines 1370-1375 Link Here
1370	// see also bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=287462	1368	// see also bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=287462
1371	public void testBug198074_dup201022() throws JavaModelException {	1369	public void testBug198074_dup201022() throws JavaModelException {
1372	this.formatterPrefs.join_wrapped_lines = false;	1370	this.formatterPrefs.join_wrapped_lines = false;
		1371	this.formatterPrefs.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
1373	String source =	1372	String source =
1374	"public class Test {\n" +	1373	"public class Test {\n" +
1375	"\n" +	1374	"\n" +
Lines 1886-1891 Link Here
1886	*/	1885	*/
1887	public void testBug281655() throws JavaModelException {	1886	public void testBug281655() throws JavaModelException {
1888	this.formatterPrefs.join_wrapped_lines = false;	1887	this.formatterPrefs.join_wrapped_lines = false;
		1888	this.formatterPrefs.alignment_for_arguments_in_annotation = Alignment.M_COMPACT_SPLIT;
		1889	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
1889	String source =	1890	String source =
1890	"@MessageDriven(mappedName = \"filiality/SchedulerMQService\", \n" +	1891	"@MessageDriven(mappedName = \"filiality/SchedulerMQService\", \n" +
1891	" activationConfig = { \n" +	1892	" activationConfig = { \n" +
Lines 1900-1907 Link Here
1900	formatSource(source,	1901	formatSource(source,
1901	"@MessageDriven(mappedName = \"filiality/SchedulerMQService\",\n" +	1902	"@MessageDriven(mappedName = \"filiality/SchedulerMQService\",\n" +
1902	" activationConfig = {\n" +	1903	" activationConfig = {\n" +
1903	" @ActivationConfigProperty(propertyName = \"cronTrigger\",\n" +	1904	" @ActivationConfigProperty(propertyName = \"cronTrigger\",\n" +
1904	" propertyValue = \"0/10 * * * * ?\")\n" +	1905	" propertyValue = \"0/10 * * * * ?\")\n" +
1905	" })\n" +	1906	" })\n" +
1906	"@RunAs(\"admin\")\n" +	1907	"@RunAs(\"admin\")\n" +
1907	"@ResourceAdapter(\"quartz-ra.rar\")\n" +	1908	"@ResourceAdapter(\"quartz-ra.rar\")\n" +
Lines 2612-2617 Link Here
2612	*/	2613	*/
2613	public void testBug286601() throws JavaModelException {	2614	public void testBug286601() throws JavaModelException {
2614	this.formatterPrefs.join_wrapped_lines = false;	2615	this.formatterPrefs.join_wrapped_lines = false;
		2616	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
		2617	this.formatterPrefs.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
		2618	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
2615	String source =	2619	String source =
2616	"public class Test\n" +	2620	"public class Test\n" +
2617	"{\n" +	2621	"{\n" +
Lines 2679-2684 Link Here
2679	public void testBug286601c() {	2683	public void testBug286601c() {
2680	this.formatterPrefs.join_wrapped_lines = false;	2684	this.formatterPrefs.join_wrapped_lines = false;
2681	this.formatterPrefs.brace_position_for_anonymous_type_declaration= DefaultCodeFormatterConstants.NEXT_LINE;	2685	this.formatterPrefs.brace_position_for_anonymous_type_declaration= DefaultCodeFormatterConstants.NEXT_LINE;
		2686	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
		2687	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
2682	String source =	2688	String source =
2683	"public class Test\n" +	2689	"public class Test\n" +
2684	"{\n" +	2690	"{\n" +
Lines 2712-2717 Link Here
2712	}	2718	}
2713	public void testBug286601d() {	2719	public void testBug286601d() {
2714	this.formatterPrefs.join_wrapped_lines = false;	2720	this.formatterPrefs.join_wrapped_lines = false;
		2721	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
		2722	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
2715	this.formatterPrefs.brace_position_for_anonymous_type_declaration= DefaultCodeFormatterConstants.NEXT_LINE;	2723	this.formatterPrefs.brace_position_for_anonymous_type_declaration= DefaultCodeFormatterConstants.NEXT_LINE;
2716	String source =	2724	String source =
2717	"public class Test\n" +	2725	"public class Test\n" +
Lines 2875-2882 Link Here
2875	formatSource(source,	2883	formatSource(source,
2876	"package massive;\n" +	2884	"package massive;\n" +
2877	"\n" +	2885	"\n" +
2878	"public class X03\n" +	2886	"public class X03 {\n" +
2879	"{\n" +
2880	"\n" +	2887	"\n" +
2881	" public void foo() throws NullPointerException {\n" +	2888	" public void foo() throws NullPointerException {\n" +
2882	"\n" +	2889	"\n" +
Lines 7110-7115 Link Here
7110	*/	7117	*/
7111	public void testBug317039_njl() {	7118	public void testBug317039_njl() {
7112	this.formatterPrefs.join_wrapped_lines = false;	7119	this.formatterPrefs.join_wrapped_lines = false;
		7120	this.formatterPrefs.brace_position_for_type_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
		7121	this.formatterPrefs.brace_position_for_method_declaration = DefaultCodeFormatterConstants.NEXT_LINE;
7113	String source =	7122	String source =
7114	"public class X01\n" +	7123	"public class X01\n" +
7115	" {\n" +	7124	" {\n" +
Lines 7754-7762 Link Here
7754	"public class X02 {\n" +	7763	"public class X02 {\n" +
7755	" public void testMethod(String currentTokenVal,\n" +	7764	" public void testMethod(String currentTokenVal,\n" +
7756	" int[][] expectedTokenSequencesVal,\n" +	7765	" int[][] expectedTokenSequencesVal,\n" +
7757	" String[] tokenImageVal\n" +	7766	" String[] tokenImageVal) {\n" +
7758	" )\n" +
7759	" {\n" +
7760	" }\n" +	7767	" }\n" +
7761	"}\n"	7768	"}\n"
7762	);	7769	);
Lines 8006-8011 Link Here
8006	}	8013	}
8007	public void testBug330313_wksp1_07_njl() {	8014	public void testBug330313_wksp1_07_njl() {
8008	this.formatterPrefs.join_wrapped_lines = false;	8015	this.formatterPrefs.join_wrapped_lines = false;
		8016	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
		8017	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
8009	String source =	8018	String source =
8010	"package wksp1;\n" +	8019	"package wksp1;\n" +
8011	"\n" +	8020	"\n" +
Lines 8025-8034 Link Here
8025	"public class X07 {\n" +	8034	"public class X07 {\n" +
8026	"\n" +	8035	"\n" +
8027	" static final long[] jjtoToken = {\n" +	8036	" static final long[] jjtoToken = {\n" +
8028	" 0x7fbfecffL,\n" +	8037	" 0x7fbfecffL,\n" +
8029	" };\n" +	8038	" };\n" +
8030	" static final long[] jjtoSkip = {\n" +	8039	" static final long[] jjtoSkip = {\n" +
8031	" 0x400000L,\n" +	8040	" 0x400000L,\n" +
8032	" };\n" +	8041	" };\n" +
8033	"\n" +	8042	"\n" +
8034	"}\n"	8043	"}\n"
Lines 8036-8041 Link Here
8036	}	8045	}
8037	public void testBug330313_wksp1_07_njl_bnl() {	8046	public void testBug330313_wksp1_07_njl_bnl() {
8038	this.formatterPrefs.join_wrapped_lines = false;	8047	this.formatterPrefs.join_wrapped_lines = false;
		8048	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
		8049	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
8039	setUpBracesPreferences(DefaultCodeFormatterConstants.NEXT_LINE);	8050	setUpBracesPreferences(DefaultCodeFormatterConstants.NEXT_LINE);
8040	String source =	8051	String source =
8041	"package wksp1;\n" +	8052	"package wksp1;\n" +
Lines 8058-8068 Link Here
8058	"\n" +	8069	"\n" +
8059	" static final long[] jjtoToken =\n" +	8070	" static final long[] jjtoToken =\n" +
8060	" {\n" +	8071	" {\n" +
8061	" 0x7fbfecffL,\n" +	8072	" 0x7fbfecffL,\n" +
8062	" };\n" +	8073	" };\n" +
8063	" static final long[] jjtoSkip =\n" +	8074	" static final long[] jjtoSkip =\n" +
8064	" {\n" +	8075	" {\n" +
8065	" 0x400000L,\n" +	8076	" 0x400000L,\n" +
8066	" };\n" +	8077	" };\n" +
8067	"\n" +	8078	"\n" +
8068	"}\n"	8079	"}\n"
Lines 8070-8075 Link Here
8070	}	8081	}
8071	public void testBug330313_wksp1_08_njl() {	8082	public void testBug330313_wksp1_08_njl() {
8072	this.formatterPrefs.join_wrapped_lines = false;	8083	this.formatterPrefs.join_wrapped_lines = false;
		8084	this.formatterPrefs.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
8073	String source =	8085	String source =
8074	"package wksp1;\n" +	8086	"package wksp1;\n" +
8075	"\n" +	8087	"\n" +
Lines 8095-8100 Link Here
8095	// testCompare1159_1: org.eclipse.debug.internal.ui.DebugUIPropertiesAdapterFactory	8107	// testCompare1159_1: org.eclipse.debug.internal.ui.DebugUIPropertiesAdapterFactory
8096	public void testBug330313_wksp1_09_njl() {	8108	public void testBug330313_wksp1_09_njl() {
8097	this.formatterPrefs.join_wrapped_lines = false;	8109	this.formatterPrefs.join_wrapped_lines = false;
		8110	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
		8111	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
8098	String source =	8112	String source =
8099	"package wksp1;\n" +	8113	"package wksp1;\n" +
8100	"\n" +	8114	"\n" +
Lines 8111-8117 Link Here
8111	"public class X09 {\n" +	8125	"public class X09 {\n" +
8112	" public Class[] getAdapterList() {\n" +	8126	" public Class[] getAdapterList() {\n" +
8113	" return new Class[] {\n" +	8127	" return new Class[] {\n" +
8114	" IWorkbenchAdapter.class\n" +	8128	" IWorkbenchAdapter.class\n" +
8115	" };\n" +	8129	" };\n" +
8116	" }\n" +	8130	" }\n" +
8117	"}\n"	8131	"}\n"
Lines 8120-8125 Link Here
8120	// testCompare1723_1: org.eclipse.jdt.internal.compiler.ast.DoubleLiteral	8134	// testCompare1723_1: org.eclipse.jdt.internal.compiler.ast.DoubleLiteral
8121	public void testBug330313_wksp1_10_njl() {	8135	public void testBug330313_wksp1_10_njl() {
8122	this.formatterPrefs.join_wrapped_lines = false;	8136	this.formatterPrefs.join_wrapped_lines = false;
		8137	this.formatterPrefs.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
8123	String source =	8138	String source =
8124	"package wksp1;\n" +	8139	"package wksp1;\n" +
8125	"\n" +	8140	"\n" +
Lines 8170-8182 Link Here
8170	"\n" +	8185	"\n" +
8171	"public class X11 {\n" +	8186	"public class X11 {\n" +
8172	" X11() {\n" +	8187	" X11() {\n" +
8173	" accessFlags &= ~(\n" +	8188	" accessFlags &= ~(AccStrictfp\n" +
8174	" AccStrictfp\n" +	8189	" \| AccProtected\n" +
8175	" \| AccProtected\n" +	8190	" \| AccPrivate\n" +
8176	" \| AccPrivate\n" +	8191	" \| AccStatic\n" +
8177	" \| AccStatic\n" +	8192	" \| AccSynchronized\n" +
8178	" \| AccSynchronized\n" +	8193	" \| AccNative);\n" +
8179	" \| AccNative);\n" +
8180	" }\n" +	8194	" }\n" +
8181	"}\n"	8195	"}\n"
8182	);	8196	);
Lines 8642-8647 Link Here
8642	// Test case extracted from org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java	8656	// Test case extracted from org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java
8643	public void testBug330313_wksp1_20_njl() {	8657	public void testBug330313_wksp1_20_njl() {
8644	this.formatterPrefs.join_wrapped_lines = false;	8658	this.formatterPrefs.join_wrapped_lines = false;
		8659	this.formatterPrefs.alignment_for_assignment = Alignment.M_COMPACT_SPLIT;
8645	String source =	8660	String source =
8646	"package wksp1;\n" +	8661	"package wksp1;\n" +
8647	"\n" +	8662	"\n" +
Lines 9066-9073 Link Here
9066	" void foo() {\n" +	9081	" void foo() {\n" +
9067	" if (inMetaTag &&\n" +	9082	" if (inMetaTag &&\n" +
9068	" (t1.image.equalsIgnoreCase(\"name\") \|\|\n" +	9083	" (t1.image.equalsIgnoreCase(\"name\") \|\|\n" +
9069	" t1.image.equalsIgnoreCase(\"HTTP-EQUIV\")\n" +	9084	" t1.image.equalsIgnoreCase(\"HTTP-EQUIV\"))\n" +
9070	" )\n" +
9071	" && t2 != null)\n" +	9085	" && t2 != null)\n" +
9072	" {\n" +	9086	" {\n" +
9073	" currentMetaTag = t2.image.toLowerCase();\n" +	9087	" currentMetaTag = t2.image.toLowerCase();\n" +
Lines 9206-9211 Link Here
9206	// Test case extracted from differences noticed with patch v33.txt	9220	// Test case extracted from differences noticed with patch v33.txt
9207	public void testBug330313_wksp1_38_njl() {	9221	public void testBug330313_wksp1_38_njl() {
9208	this.formatterPrefs.join_wrapped_lines = false;	9222	this.formatterPrefs.join_wrapped_lines = false;
		9223	this.formatterPrefs.brace_position_for_block = DefaultCodeFormatterConstants.NEXT_LINE;
		9224	this.formatterPrefs.keep_else_statement_on_same_line = false;
		9225	this.formatterPrefs.insert_new_line_before_else_in_if_statement = true;
9209	String source =	9226	String source =
9210	"package wksp1;\n" +	9227	"package wksp1;\n" +
9211	"\n" +	9228	"\n" +
Lines 9285-9292 Link Here
9285	" /* INACTIVE */{ \"INACTIVE\", \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\" },\n" +	9302	" /* INACTIVE */{ \"INACTIVE\", \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\" },\n" +
9286	" /* PARTLY_ACTIVE */{ \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\",\n" +	9303	" /* PARTLY_ACTIVE */{ \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\",\n" +
9287	" \"PARTLY_ACTIVE\" },\n" +	9304	" \"PARTLY_ACTIVE\" },\n" +
9288	" /* ACTIVE */{ \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\", \"ACTIVE\" }\n" +	9305	" /* ACTIVE */{ \"PARTLY_ACTIVE\", \"PARTLY_ACTIVE\", \"ACTIVE\" } };\n" +
9289	" };\n" +
9290	"}\n"	9306	"}\n"
9291	);	9307	);
9292	}	9308	}
Lines 9499-9504 Link Here
9499	}	9515	}
9500	public void testBug330313_wksp1_46_njl() {	9516	public void testBug330313_wksp1_46_njl() {
9501	this.formatterPrefs.join_wrapped_lines = false;	9517	this.formatterPrefs.join_wrapped_lines = false;
		9518	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
		9519	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
9502	String source =	9520	String source =
9503	"package wksp1;\n" +	9521	"package wksp1;\n" +
9504	"\n" +	9522	"\n" +
Lines 9522-9532 Link Here
9522	" void foo() {\n" +	9540	" void foo() {\n" +
9523	" if (getActive() == StackPresentation.AS_ACTIVE_NOFOCUS) {\n" +	9541	" if (getActive() == StackPresentation.AS_ACTIVE_NOFOCUS) {\n" +
9524	" drawGradient(\n" +	9542	" drawGradient(\n" +
9525	" colorRegistry\n" +	9543	" colorRegistry.get(IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" +
9526	" .get(IWorkbenchThemeConstants.INACTIVE_TAB_TEXT_COLOR),\n" +
9527	" new Color[] {\n" +	9544	" new Color[] {\n" +
9528	" colorRegistry\n" +	9545	" colorRegistry\n" +
9529	" .get(IWorkbenchThemeConstants.INACTIVE_TAB_BG_START)\n" +	9546	" .get(IWorkbenchThemeConstants.INACTIVE_TAB_BG_START)\n" +
9530	" },\n" +	9547	" },\n" +
9531	" new int[0],\n" +	9548	" new int[0],\n" +
9532	" true);\n" +	9549	" true);\n" +
Lines 9656-9661 Link Here
9656	}	9673	}
9657	public void testBug330313_wksp1_50_njl() {	9674	public void testBug330313_wksp1_50_njl() {
9658	this.formatterPrefs.join_wrapped_lines = false;	9675	this.formatterPrefs.join_wrapped_lines = false;
		9676	this.formatterPrefs.insert_new_line_after_opening_brace_in_array_initializer = true;
		9677	this.formatterPrefs.insert_new_line_before_closing_brace_in_array_initializer = true;
9659	String source =	9678	String source =
9660	"package wksp1;\n" +	9679	"package wksp1;\n" +
9661	"\n" +	9680	"\n" +
Lines 9687-9701 Link Here
9687	" // Deploy CodeSnippet class (only once)\n" +	9706	" // Deploy CodeSnippet class (only once)\n" +
9688	" requestor.acceptClassFiles(\n" +	9707	" requestor.acceptClassFiles(\n" +
9689	" new ClassFile[] {\n" +	9708	" new ClassFile[] {\n" +
9690	" new ClassFile() {\n" +	9709	" new ClassFile() {\n" +
9691	" public byte[] getBytes() {\n" +	9710	" public byte[] getBytes() {\n" +
9692	" return getCodeSnippetBytes();\n" +	9711	" return getCodeSnippetBytes();\n" +
9693	" }\n" +	9712	" }\n" +
9694	"\n" +	9713	"\n" +
9695	" public char[][] getCompoundName() {\n" +	9714	" public char[][] getCompoundName() {\n" +
9696	" return EvaluationConstants.ROOT_COMPOUND_NAME;\n" +	9715	" return EvaluationConstants.ROOT_COMPOUND_NAME;\n" +
		9716	" }\n" +
9697	" }\n" +	9717	" }\n" +
9698	" }\n" +
9699	" },\n" +	9718	" },\n" +
9700	" null);\n" +	9719	" null);\n" +
9701	" }\n" +	9720	" }\n" +
Lines 9947-9954 Link Here
9947	" .equals(remote));\n" +	9966	" .equals(remote));\n" +
9948	" }\n" +	9967	" }\n" +
9949	" }\n" +	9968	" }\n" +
9950	" }\n" +	9969	" } })\n" +
9951	" }),\n" +
9952	" // Conflicts where the file type is binary will work but are not\n" +	9970	" // Conflicts where the file type is binary will work but are not\n" +
9953	" // merged\n" +	9971	" // merged\n" +
9954	" // so they should be skipped\n" +	9972	" // so they should be skipped\n" +
Lines 10032-10039 Link Here
10032	" { 104, 20 },\n" +	10050	" { 104, 20 },\n" +
10033	" { 108, 21 },\n" +	10051	" { 108, 21 },\n" +
10034	" { 12, 1856 },\n" +	10052	" { 12, 1856 },\n" +
10035	" { 13, 1920 } },\n" +	10053	" { 13, 1920 } }, };\n" +
10036	" };\n" +
10037	"}\n"	10054	"}\n"
10038	);	10055	);
10039	}	10056	}
Lines 10167-10173 Link Here
10167	" WRITE_POTENTIAL,\n" +	10184	" WRITE_POTENTIAL,\n" +
10168	" WRITE_POTENTIAL,\n" +	10185	" WRITE_POTENTIAL,\n" +
10169	" UNKNOWN },\n" +	10186	" UNKNOWN },\n" +
10170	" /* UNKNOWN */{ UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN }\n" +	10187	" /* UNKNOWN */{ UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN } };\n" +
10171	// Should be slip but that has been broken since 3.4.2 (i.e. 3.3.2 is OK)	10188	// Should be slip but that has been broken since 3.4.2 (i.e. 3.3.2 is OK)
10172	// " /* UNKNOWN */{\n" +	10189	// " /* UNKNOWN */{\n" +
10173	// " UNKNOWN,\n" +	10190	// " UNKNOWN,\n" +
Lines 10176-10182 Link Here
10176	// " UNKNOWN,\n" +	10193	// " UNKNOWN,\n" +
10177	// " UNKNOWN,\n" +	10194	// " UNKNOWN,\n" +
10178	// " UNKNOWN }\n" +	10195	// " UNKNOWN }\n" +
10179	" };\n" +
10180	"\n" +	10196	"\n" +
10181	"}\n"	10197	"}\n"
10182	);	10198	);
Lines 10221-10228 Link Here
10221	" \"READ_POTENTIAL\",\n" +	10237	" \"READ_POTENTIAL\",\n" +
10222	" \"UNKNOWN\",\n" +	10238	" \"UNKNOWN\",\n" +
10223	" \"UNKNOWN\",\n" +	10239	" \"UNKNOWN\",\n" +
10224	" \"UNKNOWN\" },\n" +	10240	" \"UNKNOWN\" }, };\n" +
10225	" };\n" +
10226	"\n" +	10241	"\n" +
10227	"}\n"	10242	"}\n"
10228	);	10243	);
Lines 10269-10276 Link Here
10269	" \"READ_POTENTIAL\",\n" +	10284	" \"READ_POTENTIAL\",\n" +
10270	" \"UNKNOWN\",\n" +	10285	" \"UNKNOWN\",\n" +
10271	" \"UNKNOWN\",\n" +	10286	" \"UNKNOWN\",\n" +
10272	" \"UNKNOWN\" },\n" +	10287	" \"UNKNOWN\" }, };\n" +
10273	" };\n" +
10274	"\n" +	10288	"\n" +
10275	"}\n"	10289	"}\n"
10276	);	10290	);
Lines 10310-10317 Link Here
10310	" \"1234567890123456789012345678901234567890\" },\n" +	10324	" \"1234567890123456789012345678901234567890\" },\n" +
10311	" /* Comment 3 */{\n" +	10325	" /* Comment 3 */{\n" +
10312	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\",\n" +	10326	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\",\n" +
10313	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\" },\n" +	10327	" \"ABCDEFGHIJKLMNOPQRSTUVWXYZ______________\" }, };\n" +
10314	" };\n" +
10315	"\n" +	10328	"\n" +
10316	"}\n"	10329	"}\n"
10317	);	10330	);