diff options
author | Anton Leherbauer | 2007-04-06 11:56:48 +0000 |
---|---|---|
committer | Anton Leherbauer | 2007-04-06 11:56:48 +0000 |
commit | d358ef7a36061074a4d7a2a447a503a7e762e262 (patch) | |
tree | c6fc42c4c7e9c9b1ecf35208ad391b5d81968a54 /core/org.eclipse.cdt.ui.tests/resources/formatter | |
parent | 82b9f0cd2f981fabd1cfc0782ad607fc7af679d9 (diff) | |
download | org.eclipse.cdt-d358ef7a36061074a4d7a2a447a503a7e762e262.tar.gz org.eclipse.cdt-d358ef7a36061074a4d7a2a447a503a7e762e262.tar.xz org.eclipse.cdt-d358ef7a36061074a4d7a2a447a503a7e762e262.zip |
Fix formatter alignment of conditionals and initializer lists
Diffstat (limited to 'core/org.eclipse.cdt.ui.tests/resources/formatter')
-rw-r--r-- | core/org.eclipse.cdt.ui.tests/resources/formatter/preview/After.cpp | 2 | ||||
-rw-r--r-- | core/org.eclipse.cdt.ui.tests/resources/formatter/sample/After.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/org.eclipse.cdt.ui.tests/resources/formatter/preview/After.cpp b/core/org.eclipse.cdt.ui.tests/resources/formatter/preview/After.cpp index 0c900825798..508e5ff98e0 100644 --- a/core/org.eclipse.cdt.ui.tests/resources/formatter/preview/After.cpp +++ b/core/org.eclipse.cdt.ui.tests/resources/formatter/preview/After.cpp @@ -45,7 +45,7 @@ int foo(int bar) const { * Line Wrapping */ int array[]= { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 1000, - 2000, 3000, 4000, 5000 }; + 2000, 3000, 4000, 5000 }; int compare(int argument, int otherArgument) { return argument+otherArgument > argument*otherArgument+1000000 ? 100000+50000 : 200000-30000; diff --git a/core/org.eclipse.cdt.ui.tests/resources/formatter/sample/After.cpp b/core/org.eclipse.cdt.ui.tests/resources/formatter/sample/After.cpp index d5fb1895f46..da4d8fe71ee 100644 --- a/core/org.eclipse.cdt.ui.tests/resources/formatter/sample/After.cpp +++ b/core/org.eclipse.cdt.ui.tests/resources/formatter/sample/After.cpp @@ -26,11 +26,11 @@ const SimpleStruct simpleStruct = { 1, "mySimple", 0.1232 }; const SimpleStruct array[] = { { SIZEOF( simpleStruct, num ), #if FOO - "foo" + "foo" # else - "bar" + "bar" #endif - , 0.5 }, { SIZEOF( simpleStruct, floatNum ), "name", 1.1 } }; + , 0.5 }, { SIZEOF( simpleStruct, floatNum ), "name", 1.1 } }; // single line outside scope |