[IDE] Introduce ReadyForTypeCheckingCallback

This avoids the layering violation of calling `bindExtensions` from
parser code.

Author: hamishknight

lib/IDE/CodeCompletion.cpp

@@ -14,6 +14,7 @@
 #include "CodeCompletionDiagnostics.h"
 #include "CodeCompletionResultBuilder.h"
 #include "ExprContextAnalysis.h"
+#include "ReadyForTypeCheckingCallback.h"
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Comment.h"
@@ -105,7 +106,7 @@ std::string swift::ide::removeCodeCompletionTokens(
 namespace {
 
 class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
-                                    public DoneParsingCallback {
+                                    public ReadyForTypeCheckingCallback {
   CodeCompletionContext &CompletionContext;
   CodeCompletionConsumer &Consumer;
   CodeCompletionExpr *CodeCompleteTokenExpr = nullptr;
@@ -214,8 +215,8 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
   CodeCompletionCallbacksImpl(Parser &P,
                               CodeCompletionContext &CompletionContext,
                               CodeCompletionConsumer &Consumer)
-      : CodeCompletionCallbacks(P), DoneParsingCallback(),
-        CompletionContext(CompletionContext), Consumer(Consumer) {}
+      : CodeCompletionCallbacks(P), CompletionContext(CompletionContext),
+        Consumer(Consumer) {}
 
   void setAttrTargetDeclKind(std::optional<DeclKind> DK) override {
     if (DK == DeclKind::PatternBinding)
@@ -290,7 +291,7 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
   void completeTypeAttrInheritanceBeginning() override;
   void completeOptionalBinding() override;
 
-  void doneParsing(SourceFile *SrcFile) override;
+  void readyForTypeChecking(SourceFile *SrcFile) override;
 
 private:
   void addKeywords(CodeCompletionResultSink &Sink, bool MaybeFuncBody);
@@ -1622,7 +1623,7 @@ void CodeCompletionCallbacksImpl::afterPoundCompletion(SourceLoc CompletionLoc,
   Consumer.handleResults(CompletionContext);
 }
 
-void CodeCompletionCallbacksImpl::doneParsing(SourceFile *SrcFile) {
+void CodeCompletionCallbacksImpl::readyForTypeChecking(SourceFile *SrcFile) {
   CompletionContext.CodeCompletionKind = Kind;
 
   if (Kind == CompletionKind::None) {

lib/IDE/ConformingMethodList.cpp

@@ -12,6 +12,7 @@
 
 #include "swift/IDE/ConformingMethodList.h"
 #include "ExprContextAnalysis.h"
+#include "ReadyForTypeCheckingCallback.h"
 #include "swift/AST/ASTDemangler.h"
 #include "swift/AST/ConformanceLookup.h"
 #include "swift/AST/GenericEnvironment.h"
@@ -20,8 +21,8 @@
 #include "swift/Basic/Assertions.h"
 #include "swift/IDE/TypeCheckCompletionCallback.h"
 #include "swift/Parse/IDEInspectionCallbacks.h"
-#include "swift/Sema/IDETypeChecking.h"
 #include "swift/Sema/ConstraintSystem.h"
+#include "swift/Sema/IDETypeChecking.h"
 #include "clang/AST/Attr.h"
 #include "clang/AST/Decl.h"
 
@@ -30,7 +31,7 @@ using namespace ide;
 
 namespace {
 class ConformingMethodListCallbacks : public CodeCompletionCallbacks,
-                                      public DoneParsingCallback {
+                                      public ReadyForTypeCheckingCallback {
   ArrayRef<const char *> ExpectedTypeNames;
   ConformingMethodListConsumer &Consumer;
   SourceLoc Loc;
@@ -45,16 +46,16 @@ class ConformingMethodListCallbacks : public CodeCompletionCallbacks,
   ConformingMethodListCallbacks(Parser &P,
                                 ArrayRef<const char *> ExpectedTypeNames,
                                 ConformingMethodListConsumer &Consumer)
-      : CodeCompletionCallbacks(P), DoneParsingCallback(),
-        ExpectedTypeNames(ExpectedTypeNames), Consumer(Consumer) {}
+      : CodeCompletionCallbacks(P), ExpectedTypeNames(ExpectedTypeNames),
+        Consumer(Consumer) {}
 
   // Only handle callbacks for suffix completions.
   // {
   void completeDotExpr(CodeCompletionExpr *E, SourceLoc DotLoc) override;
   void completePostfixExpr(CodeCompletionExpr *E, bool hasSpace) override;
   // }
 
-  void doneParsing(SourceFile *SrcFile) override;
+  void readyForTypeChecking(SourceFile *SrcFile) override;
 };
 
 void ConformingMethodListCallbacks::completeDotExpr(CodeCompletionExpr *E,
@@ -101,7 +102,7 @@ class ConformingMethodListCallback : public TypeCheckCompletionCallback {
   ArrayRef<Result> getResults() const { return Results; }
 };
 
-void ConformingMethodListCallbacks::doneParsing(SourceFile *SrcFile) {
+void ConformingMethodListCallbacks::readyForTypeChecking(SourceFile *SrcFile) {
   if (!CCExpr || !CCExpr->getBase())
     return;
 

lib/IDE/CursorInfo.cpp

@@ -12,6 +12,7 @@
 
 #include "swift/IDE/CursorInfo.h"
 #include "ExprContextAnalysis.h"
+#include "ReadyForTypeCheckingCallback.h"
 #include "swift/AST/ASTDemangler.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/NameLookup.h"
@@ -374,14 +375,14 @@ class CursorInfoTypeCheckSolutionCallback : public TypeCheckCompletionCallback {
 
 // MARK: - CursorInfoDoneParsingCallback
 
-class CursorInfoDoneParsingCallback : public DoneParsingCallback {
+class CursorInfoDoneParsingCallback : public ReadyForTypeCheckingCallback {
   CursorInfoConsumer &Consumer;
   SourceLoc RequestedLoc;
 
 public:
   CursorInfoDoneParsingCallback(Parser &P, CursorInfoConsumer &Consumer,
                                 SourceLoc RequestedLoc)
-      : DoneParsingCallback(), Consumer(Consumer), RequestedLoc(RequestedLoc) {}
+      : Consumer(Consumer), RequestedLoc(RequestedLoc) {}
 
 private:
   /// Shared core of `getExprResult` and `getDeclResult`.
@@ -489,7 +490,7 @@ class CursorInfoDoneParsingCallback : public DoneParsingCallback {
                      SrcFile, Finder);
   }
 
-  void doneParsing(SourceFile *SrcFile) override {
+  void readyForTypeChecking(SourceFile *SrcFile) override {
     if (!SrcFile) {
       return;
     }

lib/IDE/IDETypeChecking.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Sema/IDETypeChecking.h"
+#include "ReadyForTypeCheckingCallback.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTDemangler.h"
 #include "swift/AST/ASTPrinter.h"
@@ -32,9 +33,11 @@
 #include "swift/IDE/SourceEntityWalker.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Sema/IDETypeCheckingRequests.h"
+#include "swift/Subsystems.h"
 #include "llvm/ADT/SmallVector.h"
 
 using namespace swift;
+using namespace ide;
 
 void swift::getTopLevelDeclsForDisplay(ModuleDecl *M,
                                        SmallVectorImpl<Decl *> &Results,
@@ -1028,3 +1031,11 @@ swift::getShorthandShadows(LabeledConditionalStmt *CondStmt, DeclContext *DC) {
   }
   return Result;
 }
+
+void ReadyForTypeCheckingCallback::doneParsing(SourceFile *SrcFile) {
+  // Import resolution will have already been done by IDEInspectionInstance,
+  // we need to bind extensions here though since IDEInspectionSecondPassRequest
+  // can mutate the AST.
+  bindExtensions(*SrcFile->getParentModule());
+  readyForTypeChecking(SrcFile);
+}

lib/IDE/ReadyForTypeCheckingCallback.h

@@ -0,0 +1,37 @@
+//===--- ReadyForTypeCheckingCallback.h -----------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_IDE_READYFORTYPECHECKINGCALLBACK_H
+#define SWIFT_IDE_READYFORTYPECHECKINGCALLBACK_H
+
+#include "swift/Parse/IDEInspectionCallbacks.h"
+
+namespace swift {
+namespace ide {
+
+/// IDE inspection callback that is invoked once the resulting AST is ready
+/// for type-checking work.
+class ReadyForTypeCheckingCallback : public DoneParsingCallback {
+public:
+  virtual ~ReadyForTypeCheckingCallback() {}
+
+  virtual void doneParsing(SourceFile *SrcFile) override;
+
+  /// Called when the AST has been parsed and had its imports resolved and
+  /// extensions bound.
+  virtual void readyForTypeChecking(SourceFile *SrcFile) = 0;
+};
+
+} // namespace ide
+} // namespace swift
+
+#endif // SWIFT_IDE_READYFORTYPECHECKINGCALLBACK_H

lib/IDE/SignatureHelp.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/IDE/SignatureHelp.h"
+#include "ReadyForTypeCheckingCallback.h"
 #include "swift/IDE/ArgumentCompletion.h"
 #include "swift/Sema/IDETypeChecking.h"
 
@@ -20,30 +21,30 @@ using namespace swift::constraints;
 
 namespace {
 class SignatureHelpCallbacks : public CodeCompletionCallbacks,
-                               public DoneParsingCallback {
+                               public ReadyForTypeCheckingCallback {
   SignatureHelpConsumer &Consumer;
   SourceLoc Loc;
   CodeCompletionExpr *CCExpr = nullptr;
   DeclContext *CurDeclContext = nullptr;
 
 public:
   SignatureHelpCallbacks(Parser &P, SignatureHelpConsumer &Consumer)
-      : CodeCompletionCallbacks(P), DoneParsingCallback(), Consumer(Consumer) {}
+      : CodeCompletionCallbacks(P), Consumer(Consumer) {}
 
   // Only handle callbacks for argument completions.
   // {
   void completeCallArg(CodeCompletionExpr *E) override;
   // }
 
-  void doneParsing(SourceFile *SrcFile) override;
+  void readyForTypeChecking(SourceFile *SrcFile) override;
 };
 
 void SignatureHelpCallbacks::completeCallArg(CodeCompletionExpr *E) {
   CurDeclContext = P.CurDeclContext;
   CCExpr = E;
 }
 
-void SignatureHelpCallbacks::doneParsing(SourceFile *SrcFile) {
+void SignatureHelpCallbacks::readyForTypeChecking(SourceFile *SrcFile) {
   if (!CCExpr)
     return;
 

lib/IDE/TypeContextInfo.cpp

@@ -12,6 +12,7 @@
 
 #include "swift/IDE/TypeContextInfo.h"
 #include "ExprContextAnalysis.h"
+#include "ReadyForTypeCheckingCallback.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/USRGeneration.h"
@@ -27,7 +28,7 @@ using namespace swift;
 using namespace ide;
 
 class ContextInfoCallbacks : public CodeCompletionCallbacks,
-                             public DoneParsingCallback {
+                             public ReadyForTypeCheckingCallback {
   TypeContextInfoConsumer &Consumer;
   SourceLoc Loc;
   Expr *ParsedExpr = nullptr;
@@ -37,7 +38,7 @@ class ContextInfoCallbacks : public CodeCompletionCallbacks,
 
 public:
   ContextInfoCallbacks(Parser &P, TypeContextInfoConsumer &Consumer)
-      : CodeCompletionCallbacks(P), DoneParsingCallback(), Consumer(Consumer) {}
+      : CodeCompletionCallbacks(P), Consumer(Consumer) {}
 
   void completePostfixExprBeginning(CodeCompletionExpr *E) override;
   void completeForEachSequenceBeginning(CodeCompletionExpr *E) override;
@@ -52,7 +53,7 @@ class ContextInfoCallbacks : public CodeCompletionCallbacks,
   void completeUnresolvedMember(CodeCompletionExpr *E,
                                 SourceLoc DotLoc) override;
 
-  void doneParsing(SourceFile *SrcFile) override;
+  void readyForTypeChecking(SourceFile *SrcFile) override;
 };
 
 void ContextInfoCallbacks::completePostfixExprBeginning(CodeCompletionExpr *E) {
@@ -111,7 +112,7 @@ class TypeContextInfoCallback : public TypeCheckCompletionCallback {
   ArrayRef<Type> getTypes() const { return Types; }
 };
 
-void ContextInfoCallbacks::doneParsing(SourceFile *SrcFile) {
+void ContextInfoCallbacks::readyForTypeChecking(SourceFile *SrcFile) {
   if (!ParsedExpr)
     return;
 

lib/Parse/Parser.cpp

@@ -210,13 +210,7 @@ void Parser::performIDEInspectionSecondPassImpl(
   assert(!State->hasIDEInspectionDelayedDeclState() &&
          "Second pass should not set any code completion info");
 
-  auto *SF = DC->getParentSourceFile();
-
-  // Bind extensions if needed. This needs to be done here since we may have
-  // mutated the AST above.
-  bindExtensions(*SF->getParentModule());
-
-  DoneParsingCallback->doneParsing(SF);
+  DoneParsingCallback->doneParsing(DC->getParentSourceFile());
 
   State->restoreIDEInspectionDelayedDeclState(info);
 }