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

Bug 292626 - Formatter doesn't work with wide string literals

Browse source
This commit is contained in:
Anton Leherbauer 2010-01-14 14:50:10 +00:00
parent 65dfb883a8
commit 54caf750d4
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

@ -2150,10 +2150,11 @@ public class CodeFormatterVisitor extends CPPASTVisitor {
final int line= scribe.line; final int line= scribe.line;
boolean indented= false; boolean indented= false;
try { try {
int[] stringLiterals = { Token.tSTRING, Token.tLSTRING };
while (true) { while (true) {
scribe.printNextToken(Token.tSTRING, needSpace); scribe.printNextToken(stringLiterals, needSpace);
token= peekNextToken(); token= peekNextToken();
if (token != Token.tSTRING) { if (token != Token.tSTRING && token != Token.tLSTRING) {
break; break;
} }
scribe.printCommentPreservingNewLines(); scribe.printCommentPreservingNewLines();

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

@ -1332,4 +1332,19 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testCompositeTypeSpecAsMacro_Bug298592() throws Exception { public void testCompositeTypeSpecAsMacro_Bug298592() throws Exception {
assertFormatterResult(); assertFormatterResult();
} }
//void f() {
//w_char* p = L"wide string literal";
//int x = 0;
//if (x == 0) x = 5;}
//void f() {
// w_char* p = L"wide string literal";
// int x = 0;
// if (x == 0)
// x = 5;
//}
public void testWideStringLiteral_Bug292626() throws Exception {
assertFormatterResult();
}
} }