mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

For whitesmiths, make start of line to be indented with block

Browse source
This commit is contained in:
David Dubrow 2010-04-29 16:25:12 +00:00
parent 2ec0660653
commit de22c3b311
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java
View file

@ -515,6 +515,16 @@ public class CAutoIndentTest extends AbstractAutoEditTest {
assertEquals("}", tester.getLine(1)); //$NON-NLS-1$ assertEquals("}", tester.getLine(1)); //$NON-NLS-1$
} }
public void testSkipToStatementStartWhitesmiths_Bug311018() throws Exception {
DefaultCodeFormatterOptions whitesmiths= DefaultCodeFormatterOptions.getWhitesmithsSettings();
CCorePlugin.setOptions(new HashMap<String, String>(whitesmiths.getMap()));
AutoEditTester tester = createAutoEditTester();
tester.type("if (i > 0)\n"); //$NON-NLS-1$
tester.type("{\n"); //$NON-NLS-1$
// start is indented to the brace
assertEquals("if (i > 0)\n {\n \n }", tester.fDoc.get());
}
private void assertNoError() { private void assertNoError() {
if (!fStatusLog.isEmpty()) { if (!fStatusLog.isEmpty()) {
fail(fStatusLog.get(0).toString()); fail(fStatusLog.get(0).toString());

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java
View file

@ -1319,8 +1319,8 @@ public final class CIndenter {
case Symbols.TokenWHILE: case Symbols.TokenWHILE:
case Symbols.TokenFOR: case Symbols.TokenFOR:
case Symbols.TokenTRY: case Symbols.TokenTRY:
fIndent += fPrefs.prefIndentBracesForBlocks ? 1 : 0;
return fPosition; return fPosition;
case Symbols.TokenCLASS: case Symbols.TokenCLASS:
case Symbols.TokenSTRUCT: case Symbols.TokenSTRUCT:
case Symbols.TokenUNION: case Symbols.TokenUNION: