[clang-format] Don't re-annotate CaseLabelColon as ConditionalExpr (#114639)

owenca · web-flow · commit df232d46f5b6 · 2024-11-02T14:42:41.000-07:00
Fixes #114627.
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
@@ -1259,7 +1259,7 @@ class AnnotatingParser {
 
   bool parseConditional() {
     while (CurrentToken) {
-      if (CurrentToken->is(tok::colon)) {
+      if (CurrentToken->is(tok::colon) && CurrentToken->is(TT_Unknown)) {
         CurrentToken->setType(TT_ConditionalExpr);
         next();
         return true;
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
@@ -24393,6 +24393,8 @@ TEST_F(FormatTest, DisableRegions) {
 TEST_F(FormatTest, DoNotCrashOnInvalidInput) {
   format("? ) =");
   verifyNoCrash("#define a\\\n /**/}");
+  verifyNoCrash("        tst     %o5     ! are we doing the gray case?\n"
+                "LY52:                   ! [internal]");
 }
 
 TEST_F(FormatTest, FormatsTableGenCode) {

Original file line number	Diff line number	Diff line change
`@@ -24393,6 +24393,8 @@ TEST_F(FormatTest, DisableRegions) {`
`24393`	`24393`	`TEST_F(FormatTest, DoNotCrashOnInvalidInput) {`
`24394`	`24394`	`format("? ) =");`
`24395`	`24395`	`verifyNoCrash("#define a\\\n /**/}");`
	`24396`	`+ verifyNoCrash(" tst %o5 ! are we doing the gray case?\n"`
	`24397`	`+ "LY52: ! [internal]");`
`24396`	`24398`	`}`
`24397`	`24399`
`24398`	`24400`	`TEST_F(FormatTest, FormatsTableGenCode) {`