[IDE] Skip more node in CursorInfo’ NodeFinder

Author: ahoppen

lib/IDE/CursorInfo.cpp

@@ -136,9 +136,17 @@ class NodeFinder : ASTWalker {
     return Range.contains(LocToResolve);
   }
 
+  PreWalkResult<ArgumentList *>
+  walkToArgumentListPre(ArgumentList *ArgList) override {
+    if (!rangeContainsLocToResolve(ArgList->getSourceRange())) {
+      return Action::SkipChildren(ArgList);
+    }
+    return Action::Continue(ArgList);
+  }
+
   PreWalkAction walkToDeclPre(Decl *D) override {
     if (!rangeContainsLocToResolve(D->getSourceRangeIncludingAttrs())) {
-      return PreWalkAction::SkipChildren;
+      return Action::SkipChildren();
     }
 
     if (auto *newDC = dyn_cast<DeclContext>(D)) {
@@ -182,6 +190,10 @@ class NodeFinder : ASTWalker {
       }
     }
 
+    if (!rangeContainsLocToResolve(E->getSourceRange())) {
+      return Action::SkipChildren(E);
+    }
+
     return Action::Continue(E);
   }
 
@@ -193,6 +205,20 @@ class NodeFinder : ASTWalker {
     return Action::Continue(E);
   }
 
+  PreWalkAction walkToParameterListPre(ParameterList *PL) override {
+    if (!rangeContainsLocToResolve(PL->getSourceRange())) {
+      return Action::SkipChildren();
+    }
+    return Action::Continue();
+  }
+
+  PreWalkResult<Pattern *> walkToPatternPre(Pattern *P) override {
+    if (!rangeContainsLocToResolve(P->getSourceRange())) {
+      return Action::SkipChildren(P);
+    }
+    return Action::Continue(P);
+  }
+
   PreWalkResult<Stmt *> walkToStmtPre(Stmt *S) override {
     if (auto CondStmt = dyn_cast<LabeledConditionalStmt>(S)) {
       for (auto ShorthandShadow :
@@ -201,8 +227,17 @@ class NodeFinder : ASTWalker {
         ShorthandShadowedDecls[ShorthandShadow.first] = ShorthandShadow.second;
       }
     }
+
+    if (!rangeContainsLocToResolve(S->getSourceRange())) {
+      return Action::SkipChildren(S);
+    }
+
     return Action::Continue(S);
   }
+
+  PreWalkAction walkToTypeReprPre(TypeRepr *T) override {
+    return Action::SkipChildren();
+  }
 };
 
 // MARK: - CursorInfoDoneParsingCallback