mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 13:55:39 +02:00
Code Issues Wiki Activity

Bug 537568: Apply correct indentation with template return types

Browse source 
Support optional template type specification of return type in method
declaration deduction.

Change-Id: Ibaa5d5128faefb0b95534918ba9980bd8449b851
Signed-off-by: Andrey Mozzhuhin <amozzhuhin@yandex.ru>
This commit is contained in:
Andrey Mozzhuhin 2020-01-05 23:18:26 +03:00 • committed by Jonah Graham
parent 4acce05305
commit bea8343e01
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java
View file

@ -1043,4 +1043,15 @@ public class CIndenterTest extends BaseUITestCase {
DefaultCodeFormatterConstants.INDENT_ON_COLUMN)); DefaultCodeFormatterConstants.INDENT_ON_COLUMN));
assertIndenterResult(); assertIndenterResult();
} }
//vector<int> f()
//{
//}
//vector<int> f()
//{
//}
public void testIndentationAfterFunctionHeaderWithReturnTypeTemplateSpecification_Bug537568() throws Exception {
assertIndenterResult();
}
} }

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

@ -2229,6 +2229,12 @@ public final class CIndenter {
while (skipPointerOperators()) { while (skipPointerOperators()) {
nextToken(); nextToken();
} }
// skip template type specification of function return type
if (fToken == Symbols.TokenGREATERTHAN) {
if (!skipScope())
return false;
nextToken();
}
switch (fToken) { switch (fToken) {
case Symbols.TokenIDENT: case Symbols.TokenIDENT:
return true; return true;