Use Action::Stop in more places

This used to be something we couldn't express in
certain walker methods. Update various places
where we can now use it.

Author: hamishknight

include/swift/IDE/Utils.h

@@ -287,11 +287,8 @@ class NameMatcher: public ASTWalker {
   PreWalkResult<Expr *> walkToExprPre(Expr *E) override;
   PostWalkResult<Expr *> walkToExprPost(Expr *E) override;
   PreWalkAction walkToDeclPre(Decl *D) override;
-  PostWalkAction walkToDeclPost(Decl *D) override;
   PreWalkResult<Stmt *> walkToStmtPre(Stmt *S) override;
-  PostWalkResult<Stmt *> walkToStmtPost(Stmt *S) override;
   PreWalkAction walkToTypeReprPre(TypeRepr *T) override;
-  PostWalkAction walkToTypeReprPost(TypeRepr *T) override;
   PreWalkResult<Pattern *> walkToPatternPre(Pattern *P) override;
   bool shouldWalkIntoGenericParams() override { return true; }
 

lib/IDE/Formatting.cpp

@@ -476,8 +476,6 @@ class RangeWalker: protected ASTWalker {
   }
 
   PreWalkAction walkToDeclPre(Decl *D) override {
-    // TODO: Can we use Action::Stop instead of Action::SkipChildren in this
-    // function?
     if (!walkCustomAttributes(D))
       return Action::SkipChildren();
 
@@ -504,32 +502,32 @@ class RangeWalker: protected ASTWalker {
       if (SafeToAskForGenerics) {
         if (auto *GP = GC->getParsedGenericParams()) {
           if (!handleAngles(GP->getLAngleLoc(), GP->getRAngleLoc(), ContextLoc))
-            return Action::SkipChildren();
+            return Action::Stop();
         }
       }
     }
 
     if (auto *NTD = dyn_cast<NominalTypeDecl>(D)) {
       if (!handleBraces(NTD->getBraces(), ContextLoc))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
       if (!handleBraces(ED->getBraces(), ContextLoc))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (auto *VD = dyn_cast<VarDecl>(D)) {
       if (!handleBraces(VD->getBracesRange(), VD->getNameLoc()))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (isa<AbstractFunctionDecl>(D) || isa<SubscriptDecl>(D)) {
       if (isa<SubscriptDecl>(D)) {
         if (!handleBraces(cast<SubscriptDecl>(D)->getBracesRange(), ContextLoc))
-          return Action::SkipChildren();
+          return Action::Stop();
       }
       auto *PL = getParameterList(cast<ValueDecl>(D));
       if (!handleParens(PL->getLParenLoc(), PL->getRParenLoc(), ContextLoc))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (auto *PGD = dyn_cast<PrecedenceGroupDecl>(D)) {
       SourceRange Braces(PGD->getLBraceLoc(), PGD->getRBraceLoc());
       if (!handleBraces(Braces, ContextLoc))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (auto *PDD = dyn_cast<PoundDiagnosticDecl>(D)) {
       // TODO: add paren locations to PoundDiagnosticDecl
     }
@@ -683,20 +681,18 @@ class RangeWalker: protected ASTWalker {
   }
 
   PreWalkAction walkToTypeReprPre(TypeRepr *T) override {
-    // TODO: Can we use Action::Stop instead of Action::SkipChildren in this
-    // function?
     if (auto *TT = dyn_cast<TupleTypeRepr>(T)) {
       SourceRange Parens = TT->getParens();
       if (!handleParens(Parens.Start, Parens.End, Parens.Start))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (isa<ArrayTypeRepr>(T) || isa<DictionaryTypeRepr>(T)) {
       if (!handleSquares(T->getStartLoc(), T->getEndLoc(), T->getStartLoc()))
-        return Action::SkipChildren();
+        return Action::Stop();
     } else if (auto *GI = dyn_cast<GenericIdentTypeRepr>(T)) {
       SourceLoc ContextLoc = GI->getNameLoc().getBaseNameLoc();
       SourceRange Brackets = GI->getAngleBrackets();
       if (!handleAngles(Brackets.Start, Brackets.End, ContextLoc))
-        return Action::SkipChildren();
+        return Action::Stop();
     }
     return Action::Continue();
   }