Merge pull request #1297 from DougGregor/fix-unique-name-mangling

DougGregor · web-flow · commit 6c327d511fb2 · 2023-01-31T06:31:45.000-08:00
diff --git a/Sources/SwiftSyntaxMacros/BasicMacroExpansionContext.swift b/Sources/SwiftSyntaxMacros/BasicMacroExpansionContext.swift
@@ -122,11 +122,10 @@ extension BasicMacroExpansionContext: MacroExpansionContext {
     resultString += "fMu"
 
     // Mangle the index.
-    if uniqueIndex == 0 {
-      resultString += "_"
-    } else {
+    if uniqueIndex > 0 {
       resultString += "\(uniqueIndex - 1)"
     }
+    resultString += "_"
 
     return TokenSyntax(.identifier(resultString), presence: .present)
   }
diff --git a/Tests/SwiftSyntaxMacrosTest/MacroSystemTests.swift b/Tests/SwiftSyntaxMacrosTest/MacroSystemTests.swift
@@ -738,7 +738,7 @@ final class MacroSystemTests: XCTestCase {
     let t2 = context.createUniqueName("mine")
     XCTAssertNotEqual(t1.description, t2.description)
     XCTAssertEqual(t1.description, "__macro_local_4minefMu_")
-    XCTAssertEqual(t2.description, "__macro_local_4minefMu0")
+    XCTAssertEqual(t2.description, "__macro_local_4minefMu0_")
   }
 
   func testContextIndependence() {

Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,10 @@ extension BasicMacroExpansionContext: MacroExpansionContext {`
`122`	`122`	`resultString += "fMu"`
`123`	`123`
`124`	`124`	`// Mangle the index.`
`125`		`- if uniqueIndex == 0 {`
`126`		`- resultString += "_"`
`127`		`- } else {`
	`125`	`+ if uniqueIndex > 0 {`
`128`	`126`	`resultString += "\(uniqueIndex - 1)"`
`129`	`127`	`}`
	`128`	`+ resultString += "_"`
`130`	`129`
`131`	`130`	`return TokenSyntax(.identifier(resultString), presence: .present)`
`132`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,7 @@ final class MacroSystemTests: XCTestCase {`
`738`	`738`	`let t2 = context.createUniqueName("mine")`
`739`	`739`	`XCTAssertNotEqual(t1.description, t2.description)`
`740`	`740`	`XCTAssertEqual(t1.description, "__macro_local_4minefMu_")`
`741`		`- XCTAssertEqual(t2.description, "__macro_local_4minefMu0")`
	`741`	`+ XCTAssertEqual(t2.description, "__macro_local_4minefMu0_")`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`func testContextIndependence() {`