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 350433 - [formatter] Line wrapping if "\ua" or "\ud" occurs in preprocessor directive

Browse source
This commit is contained in:
Anton Leherbauer 2011-08-05 15:13:13 +02:00
parent 60de352b8e
commit b7382e51f1
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/SimpleScanner.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2010 IBM Corporation and others. * Copyright (c) 2004, 2011 IBM Corporation 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
@ -800,7 +800,7 @@ public class SimpleScanner {
private void getRestOfPreprocessorLine() { private void getRestOfPreprocessorLine() {
int c = getChar(); int c = getChar();
while (true) { while (true) {
while ((c != '\n') && (c != '\r') && (c != '/') && (c != EOFCHAR)) { while ((c != '\n') && (c != '\r') && (c != '/') && (c != '"') && (c != EOFCHAR)) {
c = getChar(); c = getChar();
} }
if (c == '/') { if (c == '/') {
@ -823,6 +823,9 @@ public class SimpleScanner {
c = next; c = next;
continue; continue;
} }
} else if (c == '"') {
matchStringLiteral();
c = getChar();
} else { } else {
ungetChar(c); ungetChar(c);
break; break;

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

@ -2512,4 +2512,10 @@ public class CodeFormatterTest extends BaseUITestCase {
public void testMacroInBinaryExpression_Bug344379() throws Exception { public void testMacroInBinaryExpression_Bug344379() throws Exception {
assertFormatterResult(); assertFormatterResult();
} }
public void testBackslashUInPreprocessorDirective_Bug350433() throws Exception {
String before= "#include \"test\\udp.h\"\n";
String expected= before;
assertFormatterResult(before, expected);
}
} }