diff options
| -rw-r--r-- | clang/lib/Tooling/Refactoring/Extract/SourceExtraction.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Refactor/Extract/ExtractionSemicolonPolicy.cpp | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/clang/lib/Tooling/Refactoring/Extract/SourceExtraction.cpp b/clang/lib/Tooling/Refactoring/Extract/SourceExtraction.cpp index 533c373e35c..9b0c37b1709 100644 --- a/clang/lib/Tooling/Refactoring/Extract/SourceExtraction.cpp +++ b/clang/lib/Tooling/Refactoring/Extract/SourceExtraction.cpp @@ -40,8 +40,11 @@ bool isSemicolonRequiredAfter(const Stmt *S) { return isSemicolonRequiredAfter(CXXFor->getBody()); if (const auto *ObjCFor = dyn_cast<ObjCForCollectionStmt>(S)) return isSemicolonRequiredAfter(ObjCFor->getBody()); + if(const auto *Switch = dyn_cast<SwitchStmt>(S)) + return isSemicolonRequiredAfter(Switch->getBody()); + if(const auto *Case = dyn_cast<SwitchCase>(S)) + return isSemicolonRequiredAfter(Case->getSubStmt()); switch (S->getStmtClass()) { - case Stmt::SwitchStmtClass: case Stmt::CXXTryStmtClass: case Stmt::ObjCAtSynchronizedStmtClass: case Stmt::ObjCAutoreleasePoolStmtClass: diff --git a/clang/test/Refactor/Extract/ExtractionSemicolonPolicy.cpp b/clang/test/Refactor/Extract/ExtractionSemicolonPolicy.cpp index 5caf9d45268..97f12475761 100644 --- a/clang/test/Refactor/Extract/ExtractionSemicolonPolicy.cpp +++ b/clang/test/Refactor/Extract/ExtractionSemicolonPolicy.cpp @@ -64,6 +64,7 @@ void extractStatementNotSemiSwitch() { // CHECK-NEXT: extracted();{{$}} // CHECK-NEXT: } + void extractStatementNotSemiWhile() { /*range eextract=->+2:4*/while (true) { int x = 0; @@ -190,3 +191,15 @@ void careForNonCompoundSemicolons2() { // CHECK-NEXT: extracted();{{$}} // CHECK-NEXT: // // CHECK-NEXT: } + +void careForSwitchSemicolon() { + /*range mextract=->+0:51*/switch(0) default: break; +} +// CHECK: 1 'mextract' results: +// CHECK: static void extracted() { +// CHECK-NEXT: switch(0) default: break;{{$}} +// CHECK-NEXT: }{{[[:space:]].*}} +// CHECK-NEXT: void careForSwitchSemicolon() { +// CHECK-NEXT: extracted();{{$}} +// CHECK-NEXT: } + |
