Merge pull request #28038 from davidungar/rdar-56760957-dont-do-ide-lookups-into-inactive-clauses

[SourceKit NameLookup] Don't walk into inactive clauses.

Author: David Ungar

include/swift/AST/NameLookup.h

@@ -627,6 +627,8 @@ class ASTScope {
     return Mem;
   }
 
+  static bool areInactiveIfConfigClausesSupported();
+
 private:
   static ast_scope::ASTSourceFileScope *createScopeTree(SourceFile *);
 };

lib/AST/ASTScopeCreation.cpp

@@ -731,6 +731,10 @@ void ASTScope::
   impl->buildEnoughOfTreeForTopLevelExpressionsButDontRequestGenericsOrExtendedNominals();
 }
 
+bool ASTScope::areInactiveIfConfigClausesSupported() {
+  return ScopeCreator::includeInactiveIfConfigClauses;
+}
+
 ASTSourceFileScope *ASTScope::createScopeTree(SourceFile *SF) {
   ScopeCreator *scopeCreator = new (SF->getASTContext()) ScopeCreator(SF);
   return scopeCreator->sourceFileScope;

lib/IDE/SyntaxModel.cpp

@@ -15,6 +15,7 @@
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
+#include "swift/AST/NameLookup.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/Module.h"
@@ -346,6 +347,21 @@ class ModelASTWalker : public ASTWalker {
   /// is considered as one, e.g. object literal expression.
   uint8_t AvoidPassingSyntaxToken = 0;
 
+  class InactiveClauseRAII {
+    const bool wasInInactiveClause;
+    bool &isInInactiveClause;
+
+  public:
+    InactiveClauseRAII(bool &isInInactiveClauseArg, bool enteringInactiveClause)
+        : wasInInactiveClause(isInInactiveClauseArg),
+          isInInactiveClause(isInInactiveClauseArg) {
+      isInInactiveClause |= enteringInactiveClause;
+    }
+    ~InactiveClauseRAII() { isInInactiveClause = wasInInactiveClause; }
+  };
+  friend class InactiveClauseRAII;
+  bool inInactiveClause = false;
+
 public:
   SyntaxModelWalker &Walker;
   ArrayRef<SyntaxNode> TokenNodes;
@@ -890,7 +906,8 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
   } else if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
     // Normally bindExtension() would take care of computing the extended
     // nominal. It must be done before asking for generic parameters.
-    ED->computeExtendedNominal();
+    if (!inInactiveClause || ASTScope::areInactiveIfConfigClausesSupported())
+      ED->computeExtendedNominal();
     SyntaxStructureNode SN;
     setDecl(SN, D);
     SN.Kind = SyntaxStructureKind::Extension;
@@ -967,6 +984,7 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
       if (Clause.Cond && !annotateIfConfigConditionIdentifiers(Clause.Cond))
         return false;
 
+      InactiveClauseRAII inactiveClauseRAII(inInactiveClause, !Clause.isActive);
       for (auto &Element : Clause.Elements) {
         if (auto *E = Element.dyn_cast<Expr*>()) {
           E->walk(*this);