Rename MacroEvaluationContext to MacroExpansionContext.

We're talking about these as macro "expansions" uniformly, now.

Author: DougGregor

Sources/_SwiftSyntaxMacros/CMakeLists.txt

@@ -9,7 +9,7 @@
 add_swift_host_library(_SwiftSyntaxMacros
   ExpressionMacro.swift
   Macro.swift
-  MacroEvaluationContext.swift
+  MacroExpansionContext.swift
   MacroResult.swift
   MacroSystem+Builtin.swift
   MacroSystem+Examples.swift

Sources/_SwiftSyntaxMacros/ExpressionMacro.swift

@@ -22,7 +22,7 @@ public protocol ExpressionMacro: Macro {
   /// Evaluate a macro described by the given macro expansion expression
   /// within the given context to produce a replacement expression.
   static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax>
 }
 
@@ -66,7 +66,7 @@ extension ExpressionMacro {
     let sourceFileSyntax = Parser.parse(source: sourceFileTextBuffer)
     let converter = SourceLocationConverter(
       file: filePath, tree: sourceFileSyntax)
-    let context = MacroEvaluationContext(
+    let context = MacroExpansionContext(
       moduleName: targetModuleName, sourceLocationConverter: converter)
     let meePosition = AbsolutePosition(
       utf8Offset: sourceFileText.distance(to: localSourceText))

Sources/_SwiftSyntaxMacros/MacroEvaluationContext.swift renamed to Sources/_SwiftSyntaxMacros/MacroExpansionContext.swift

@@ -14,7 +14,7 @@ import SwiftSyntax
 
 /// System-supplied structure that provides information about the context in
 /// which a given macro is being expanded.
-public struct MacroEvaluationContext {
+public struct MacroExpansionContext {
   /// The name of the module in which the macro is being evaluated.
   public let moduleName: String
 

Sources/_SwiftSyntaxMacros/MacroSystem+Builtin.swift

@@ -116,7 +116,7 @@ public struct FunctionMacro: ExpressionMacro {
   }
 
   public static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax> {
     let name = findEnclosingName(macro) ?? context.moduleName
     let literal: ExprSyntax = "\(literal: name)"
@@ -143,7 +143,7 @@ private func replaceFirstLabel(
 
 public struct ColorLiteralMacro: ExpressionMacro {
   public static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax> {
     let argList = replaceFirstLabel(
       of: macro.argumentList, with: "_colorLiteralRed"
@@ -158,7 +158,7 @@ public struct ColorLiteralMacro: ExpressionMacro {
 
 public struct FileLiteralMacro: ExpressionMacro {
   public static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax> {
     let argList = replaceFirstLabel(
       of: macro.argumentList, with: "fileReferenceLiteralResourceName"
@@ -173,7 +173,7 @@ public struct FileLiteralMacro: ExpressionMacro {
 
 public struct ImageLiteralMacro: ExpressionMacro {
   public static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax> {
     let argList = replaceFirstLabel(
       of: macro.argumentList, with: "imageLiteralResourceName"
@@ -188,7 +188,7 @@ public struct ImageLiteralMacro: ExpressionMacro {
 
 public struct FileIDMacro: ExpressionMacro {
   public static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax> {
     // FIXME: Compiler has more sophisticated file ID computation
     let fileID = "\(context.moduleName)/\(context.fileName)"

Sources/_SwiftSyntaxMacros/MacroSystem+Examples.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 // Macros used for testing purposes
 public struct StringifyMacro: ExpressionMacro {
   public static func apply(
-    _ macro: MacroExpansionExprSyntax, in context: MacroEvaluationContext
+    _ macro: MacroExpansionExprSyntax, in context: MacroExpansionContext
   ) -> MacroResult<ExprSyntax> {
     guard let argument = macro.argumentList.first?.expression else {
       // FIXME: Create a diagnostic for the missing argument?

Sources/_SwiftSyntaxMacros/MacroSystem.swift

@@ -62,12 +62,12 @@ public struct MacroSystem {
 /// Syntax rewriter that evaluates any macros encountered along the way.
 class MacroApplication : SyntaxRewriter {
   let macroSystem: MacroSystem
-  let context: MacroEvaluationContext
+  let context: MacroExpansionContext
   let errorHandler: (MacroSystemError) -> Void
 
   init(
     macroSystem: MacroSystem,
-    context: MacroEvaluationContext,
+    context: MacroExpansionContext,
     errorHandler: @escaping (MacroSystemError) -> Void
   ) {
     self.macroSystem = macroSystem
@@ -113,7 +113,7 @@ extension MacroSystem {
   /// - Returns: the syntax tree with all macros evaluated.
   public func evaluateMacros<Node: SyntaxProtocol>(
     node: Node,
-    in context: MacroEvaluationContext,
+    in context: MacroExpansionContext,
     errorHandler: (MacroSystemError) -> Void
   ) -> Syntax {
     return withoutActuallyEscaping(errorHandler) { errorHandler in

Sources/_SwiftSyntaxMacros/Syntax+MacroEvaluation.swift

@@ -18,7 +18,7 @@ extension MacroExpansionExprSyntax {
   /// result and (possibly) some diagnostics.
   func evaluateMacro(
     _ macro: Macro.Type,
-    in context: MacroEvaluationContext,
+    in context: MacroExpansionContext,
     errorHandler: (MacroSystemError) -> Void
   ) -> ExprSyntax {
     guard let exprMacro = macro as? ExpressionMacro.Type else {
@@ -65,7 +65,7 @@ extension MacroExpansionDeclSyntax {
   /// result and (possibly) some diagnostics.
   func evaluateMacro(
     _ macro: Macro.Type,
-    in context: MacroEvaluationContext,
+    in context: MacroExpansionContext,
     errorHandler: (MacroSystemError) -> Void
   ) -> Syntax {
     // TODO: declaration/statement macros
@@ -104,7 +104,7 @@ extension Syntax {
   /// some kind.
   public func evaluateMacro(
     with macroSystem: MacroSystem,
-    context: MacroEvaluationContext,
+    context: MacroExpansionContext,
     errorHandler: (MacroSystemError) -> Void
   ) -> Syntax {
     // If this isn't a macro evaluation node, do nothing.

Sources/swift-parser-cli/swift-parser-cli.swift

@@ -242,7 +242,7 @@ class ExpandMacros: ParsableCommand {
         resultTree = Syntax(tree)
       }
 
-      let context = MacroEvaluationContext(
+      let context = MacroExpansionContext(
         moduleName: "MyModule", fileName: self.sourceFile.withoutPath()
       )
       var diags = ParseDiagnosticsGenerator.diagnostics(for: tree)

Tests/SwiftSyntaxMacrosTest/MacroSystemTests.swift

@@ -23,7 +23,7 @@ final class MacroSystemTests: XCTestCase {
       let b = #stringify(x + y)
       #colorLiteral(red: 0.5, green: 0.5, blue: 0.25, alpha: 1.0)
       """
-    let context = MacroEvaluationContext(
+    let context = MacroExpansionContext(
       moduleName: "MyModule", fileName: "test.swift"
     )
     let transformedSF = MacroSystem.exampleSystem.evaluateMacros(
@@ -46,7 +46,7 @@ final class MacroSystemTests: XCTestCase {
         return true
       })
       """
-    let context = MacroEvaluationContext(
+    let context = MacroExpansionContext(
       moduleName: "MyModule", fileName: "test.swift"
     )
     let transformedSF = MacroSystem.exampleSystem.evaluateMacros(
@@ -94,7 +94,7 @@ final class MacroSystemTests: XCTestCase {
         static var staticProp: String = #function
       }
       """
-    let context = MacroEvaluationContext(
+    let context = MacroExpansionContext(
       moduleName: "MyModule", fileName: "test.swift"
     )
     let transformedSF = MacroSystem.exampleSystem.evaluateMacros(
@@ -139,7 +139,7 @@ final class MacroSystemTests: XCTestCase {
       """
       let b = #fileID
       """
-    let context = MacroEvaluationContext(
+    let context = MacroExpansionContext(
       moduleName: "MyModule", fileName: "taylor.swift"
     )
     let transformedSF = MacroSystem.exampleSystem.evaluateMacros(