Merge pull request swiftlang#79131 from allevato/6.1-json-ast-followups

🍒 [6.1] [ASTDumper] Some followups from the initial JSON PR and macro dumping improvements.

Author: bnbarham

include/swift/AST/ASTDumper.h

@@ -0,0 +1,41 @@
+//===--- ASTDumper.h - Swift AST Dumper flags -------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines types that are used to control the level of detail printed
+// by the AST dumper.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_AST_AST_DUMPER_H
+#define SWIFT_AST_AST_DUMPER_H
+
+namespace swift {
+
+/// Describes the nature of requests that should be kicked off, if any, to
+/// compute members and top-level decls when dumping an AST.
+enum class ASTDumpMemberLoading {
+  /// Dump cached members if available; if they are not, do not kick off any
+  /// parsing or type-checking requests.
+  None,
+
+  /// Dump parsed members, kicking off a parsing request if necessary to compute
+  /// them, but not performing additional type-checking.
+  Parsed,
+
+  /// Dump all fully-type checked members, kicking off any requests necessary to
+  /// compute them.
+  TypeChecked,
+};
+
+} // namespace swift
+
+#endif // SWIFT_AST_AST_DUMPER_H

include/swift/AST/SourceFile.h

@@ -13,16 +13,17 @@
 #ifndef SWIFT_AST_SOURCEFILE_H
 #define SWIFT_AST_SOURCEFILE_H
 
+#include "swift/AST/ASTDumper.h"
 #include "swift/AST/ASTNode.h"
 #include "swift/AST/FileUnit.h"
 #include "swift/AST/IfConfigClauseRangeInfo.h"
 #include "swift/AST/Import.h"
 #include "swift/AST/SynthesizedFileUnit.h"
 #include "swift/Basic/Debug.h"
 #include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/STLExtras.h"
 
 namespace swift {
 
@@ -678,10 +679,12 @@ class SourceFile final : public FileUnit {
   }
 
   SWIFT_DEBUG_DUMP;
-  void dump(raw_ostream &os, bool parseIfNeeded = false) const;
+  void
+  dump(raw_ostream &os,
+       ASTDumpMemberLoading memberLoading = ASTDumpMemberLoading::None) const;
 
   /// Dumps this source file's AST in JSON format to the given output stream.
-  void dumpJSON(raw_ostream &os) const;
+  void dumpJSON(raw_ostream &os, ASTDumpMemberLoading memberLoading) const;
 
   /// Pretty-print the contents of this source file.
   ///