Merge pull request #1657 from rintaro/plugin-limit-operatorfolding

[Macros] Don't fold operators in unnecessary nodes

Author: rintaro

Sources/SwiftCompilerPluginMessageHandling/Macros.swift

@@ -12,6 +12,7 @@
 
 import SwiftBasicFormat
 import SwiftDiagnostics
+import SwiftOperators
 import SwiftSyntax
 import SwiftSyntaxMacros
 import SwiftSyntaxMacroExpansion
@@ -29,7 +30,7 @@ extension CompilerPluginMessageHandler {
     expandingSyntax: PluginMessage.Syntax
   ) throws {
     let sourceManager = SourceManager()
-    let syntax = sourceManager.add(expandingSyntax)
+    let syntax = sourceManager.add(expandingSyntax, foldingWith: .standardOperators)
 
     let context = PluginMacroExpansionContext(
       sourceManager: sourceManager,
@@ -78,7 +79,10 @@ extension CompilerPluginMessageHandler {
       expansionDiscriminator: discriminator
     )
 
-    let attributeNode = sourceManager.add(attributeSyntax).cast(AttributeSyntax.self)
+    let attributeNode = sourceManager.add(
+      attributeSyntax,
+      foldingWith: .standardOperators
+    ).cast(AttributeSyntax.self)
     let declarationNode = sourceManager.add(declSyntax).cast(DeclSyntax.self)
     let parentDeclNode = parentDeclSyntax.map { sourceManager.add($0).cast(DeclSyntax.self) }
 

Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift

@@ -64,7 +64,10 @@ class SourceManager {
 
   /// Convert syntax information to a `Syntax` node. The location informations
   /// are cached in the source manager to provide `location(of:)` et al.
-  func add(_ syntaxInfo: PluginMessage.Syntax) -> Syntax {
+  func add(
+    _ syntaxInfo: PluginMessage.Syntax,
+    foldingWith operatorTable: OperatorTable? = nil
+  ) -> Syntax {
 
     var node: Syntax
     var parser = Parser(syntaxInfo.source)
@@ -82,7 +85,9 @@ class SourceManager {
     case .attribute:
       node = Syntax(AttributeSyntax.parse(from: &parser))
     }
-    node = OperatorTable.standardOperators.foldAll(node, errorHandler: { _ in /*ignore*/ })
+    if let operatorTable = operatorTable {
+      node = operatorTable.foldAll(node, errorHandler: { _ in /*ignore*/ })
+    }
 
     // Copy the location info from the plugin message.
     let location = KnownSourceSyntax.Location(