mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

Bug 464498 - sizeof...() operator formatting exception

Browse source 
Fix for exception when formatting sizeof...

Change-Id: Ibe228ee5566b9155e1e86853506f3ee516d05e7a
Signed-off-by: Thomas Corbat <tcorbat@hsr.ch>
This commit is contained in:
Thomas Corbat 2016-12-14 11:52:12 +01:00
parent 473c5c8ff1
commit b218771722
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2016 Wind River Systems, Inc. and others. * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -2416,6 +2416,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
return PROCESS_SKIP; return PROCESS_SKIP;
} }
scribe.printNextToken(peekNextToken()); scribe.printNextToken(peekNextToken());
if (peekNextToken() == IToken.tELLIPSIS) {
scribe.printNextToken(IToken.tELLIPSIS);
}
scribe.printNextToken(Token.tLPAREN); scribe.printNextToken(Token.tLPAREN);
node.getTypeId().accept(this); node.getTypeId().accept(this);
if (peekNextToken() == Token.tCOMMA) { if (peekNextToken() == Token.tCOMMA) {

15
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2016 Wind River Systems, Inc. and others. * Copyright (c) 2007, 2017 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -3196,4 +3196,17 @@ public class CodeFormatterTest extends BaseUITestCase {
CCorePlugin.DO_NOT_INSERT); CCorePlugin.DO_NOT_INSERT);
assertFormatterResult(); assertFormatterResult();
} }
//template<typename ...ARGS>
//int count(ARGS ... args) {
// return sizeof...(ARGS);
//}
//template<typename ...ARGS>
//int count(ARGS ... args) {
// return sizeof...(ARGS);
//}
public void testSizeofParameterPackFormat_464498() throws Exception {
assertFormatterResult();
}
} }