Merge pull request #63693 from DougGregor/trim-attr-name

swift-ci · web-flow · commit f68647ac3940 · 2023-02-15T18:01:41.000-08:00
Trim the attribute name when grabbing it from a syntax tree
diff --git a/lib/ASTGen/Sources/ASTGen/Macros.swift b/lib/ASTGen/Sources/ASTGen/Macros.swift
@@ -354,7 +354,7 @@ func expandAttachedMacro(
     discriminator: discriminator
   )
 
-  let macroName = customAttrNode.attributeName.description
+  let macroName = customAttrNode.attributeName.trimmedDescription
   var evaluatedSyntaxStr: String
   do {
     switch (macro, macroRole) {
diff --git a/test/Macros/macro_expand_throwing.swift b/test/Macros/macro_expand_throwing.swift
@@ -14,7 +14,7 @@
 
 func testThrownError() {
   let name = "hello"
-  #myWarning(name) // expected-error{{#myWarning macro requires a string literal (from macro 'myWarning')}}
+  #myWarning (name) // expected-error{{#myWarning macro requires a string literal (from macro 'myWarning')}}
 
   #myWarning("experimental features ahead") // expected-warning{{experimental features ahead}}
 }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ func expandAttachedMacro(`
`354`	`354`	`discriminator: discriminator`
`355`	`355`	`)`
`356`	`356`
`357`		`- let macroName = customAttrNode.attributeName.description`
	`357`	`+ let macroName = customAttrNode.attributeName.trimmedDescription`
`358`	`358`	`var evaluatedSyntaxStr: String`
`359`	`359`	`do {`
`360`	`360`	`switch (macro, macroRole) {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`func testThrownError() {`
`16`	`16`	`let name = "hello"`
`17`		`- #myWarning(name) // expected-error{{#myWarning macro requires a string literal (from macro 'myWarning')}}`
	`17`	`+ #myWarning (name) // expected-error{{#myWarning macro requires a string literal (from macro 'myWarning')}}`
`18`	`18`
`19`	`19`	`#myWarning("experimental features ahead") // expected-warning{{experimental features ahead}}`
`20`	`20`	`}`