diff options
| author | David Dubrow | 2010-04-13 14:26:53 +0000 |
|---|---|---|
| committer | David Dubrow | 2010-04-13 14:26:53 +0000 |
| commit | a60027bd99f361700fd78c4036ece19044cf5ecc (patch) | |
| tree | ae4f9aed9a8c36a92b8934d92840ed3ea5fae915 /core | |
| parent | 868b8f9a8ab110986633403de56b6cce751b0a1a (diff) | |
| download | org.eclipse.cdt-a60027bd99f361700fd78c4036ece19044cf5ecc.tar.gz org.eclipse.cdt-a60027bd99f361700fd78c4036ece19044cf5ecc.tar.xz org.eclipse.cdt-a60027bd99f361700fd78c4036ece19044cf5ecc.zip | |
Fix and test for case where method body brace should be indented once - bug 298282
Diffstat (limited to 'core')
| -rw-r--r-- | core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java | 6 | ||||
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java index f66a63dbd13..b4d177bbe28 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java @@ -814,9 +814,11 @@ public class CIndenterTest extends BaseUITestCase { //} //void t() const - //{ - //} + // { + // } public void testIndentationOfConstMethodBody_Bug298282() throws Exception { + fOptions.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, + DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED); assertIndenterResult(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java index 46f88bd562d..0255458e466 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java @@ -847,7 +847,7 @@ public final class CIndenter { } else if ((prevToken == Symbols.TokenEQUAL || prevToken == Symbols.TokenRBRACKET) && !fPrefs.prefIndentBracesForArrays) { cancelIndent= true; - } else if (prevToken == Symbols.TokenRPAREN && fPrefs.prefIndentBracesForMethods) { + } else if ((prevToken == Symbols.TokenRPAREN || prevToken == Symbols.TokenCONST) && fPrefs.prefIndentBracesForMethods) { extraIndent= 1; } else if (prevToken == Symbols.TokenIDENT && fPrefs.prefIndentBracesForTypes) { extraIndent= 1; |