Skip to content

[test] Fix warnings in syntax_macro_definitions.swift #69338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions test/Macros/Inputs/syntax_macro_definitions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public struct ColorLiteralMacro: ExpressionMacro {
in context: some MacroExpansionContext
) -> ExprSyntax {
let argList = replaceFirstLabel(
of: macro.argumentList, with: "_colorLiteralRed"
of: macro.arguments, with: "_colorLiteralRed"
)
let initSyntax: ExprSyntax = ".init(\(argList))"
return initSyntax
Expand Down Expand Up @@ -51,7 +51,7 @@ public struct AssertMacro: ExpressionMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) -> ExprSyntax {
guard let argument = macro.argumentList.first?.expression else {
guard let argument = macro.arguments.first?.expression else {
fatalError("boom")
}

Expand All @@ -64,7 +64,7 @@ public struct StringifyMacro: ExpressionMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) -> ExprSyntax {
guard let argument = macro.argumentList.first?.expression else {
guard let argument = macro.arguments.first?.expression else {
fatalError("boom")
}

Expand All @@ -77,7 +77,7 @@ public struct ExprAndDeclMacro: ExpressionMacro, DeclarationMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) -> ExprSyntax {
guard let argument = macro.argumentList.first?.expression else {
guard let argument = macro.arguments.first?.expression else {
fatalError("boom")
}

Expand All @@ -97,7 +97,7 @@ public struct StringifyAndTryMacro: ExpressionMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) -> ExprSyntax {
guard let argument = macro.argumentList.first?.expression else {
guard let argument = macro.arguments.first?.expression else {
fatalError("boom")
}

Expand Down Expand Up @@ -180,7 +180,7 @@ public enum AddBlocker: ExpressionMacro {
context.diagnose(diag)
}

return result.asProtocol(FreestandingMacroExpansionSyntax.self)!.argumentList.first!.expression
return result.asProtocol(FreestandingMacroExpansionSyntax.self)!.arguments.first!.expression
}
}

Expand All @@ -189,7 +189,7 @@ public class RecursiveMacro: ExpressionMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) -> ExprSyntax {
guard let argument = macro.argumentList.first?.expression,
guard let argument = macro.arguments.first?.expression,
argument.description == "false" else {
return "\(macro)"
}
Expand Down Expand Up @@ -237,7 +237,7 @@ public struct DefineBitwidthNumberedStructsMacro: DeclarationMacro {
of node: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) throws -> [DeclSyntax] {
guard let firstElement = node.argumentList.first,
guard let firstElement = node.arguments.first,
let stringLiteral = firstElement.expression.as(StringLiteralExprSyntax.self),
stringLiteral.segments.count == 1,
case let .stringSegment(prefix) = stringLiteral.segments.first else {
Expand Down Expand Up @@ -333,7 +333,7 @@ public struct WarningMacro: ExpressionMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) throws -> ExprSyntax {
guard let firstElement = macro.argumentList.first,
guard let firstElement = macro.arguments.first,
let stringLiteral = firstElement.expression
.as(StringLiteralExprSyntax.self),
stringLiteral.segments.count == 1,
Expand Down Expand Up @@ -362,13 +362,13 @@ public struct ErrorMacro: ExpressionMacro {
of macro: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) throws -> ExprSyntax {
guard let firstElement = macro.argumentList.first,
guard let firstElement = macro.arguments.first,
let stringLiteral = firstElement.expression.as(StringLiteralExprSyntax.self),
stringLiteral.segments.count == 1,
case let .stringSegment(messageString)? = stringLiteral.segments.first
else {
let errorNode: Syntax
if let firstElement = macro.argumentList.first {
if let firstElement = macro.arguments.first {
errorNode = Syntax(firstElement)
} else {
errorNode = Syntax(macro)
Expand Down Expand Up @@ -470,6 +470,8 @@ extension AccessorBlockSyntax {
return false
case .getter:
return true
@unknown default:
return false
}
}
}
Expand Down Expand Up @@ -512,12 +514,6 @@ public struct WillSetMacro: AccessorMacro {
providingAccessorsOf declaration: some DeclSyntaxProtocol,
in context: some MacroExpansionContext
) throws -> [AccessorDeclSyntax] {
guard let varDecl = declaration.as(VariableDeclSyntax.self),
let binding = varDecl.bindings.first,
let identifier = binding.pattern.as(IdentifierPatternSyntax.self)?.identifier else {
return []
}

return [
"""
willSet { }
Expand Down Expand Up @@ -854,7 +850,7 @@ public enum LeftHandOperandFinderMacro: ExpressionMacro {
let visitor = Visitor(context: context)
visitor.walk(node)

return node.argumentList.first!.expression
return node.arguments.first!.expression
}
}

Expand Down Expand Up @@ -995,7 +991,7 @@ public struct CoerceToIntMacro: ExpressionMacro {
of node: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) -> ExprSyntax {
"\(node.argumentList.first!.expression) as Int"
"\(node.arguments.first!.expression) as Int"
}
}

Expand Down Expand Up @@ -1660,7 +1656,7 @@ public struct DefineAnonymousTypesMacro: DeclarationMacro {
}

let accessSpecifier: String
if let _ = node.argumentList.first(labeled: "public") {
if let _ = node.arguments.first(labeled: "public") {
accessSpecifier = "public "
} else {
accessSpecifier = ""
Expand Down Expand Up @@ -1695,7 +1691,7 @@ public struct DefineAnonymousTypesMacro: DeclarationMacro {
"""
]

if let _ = node.argumentList.first(labeled: "causeErrors") {
if let _ = node.arguments.first(labeled: "causeErrors") {

results += ["""

Expand Down Expand Up @@ -1836,7 +1832,7 @@ public struct UseIdentifierMacro: DeclarationMacro {
of node: some FreestandingMacroExpansionSyntax,
in context: some MacroExpansionContext
) throws -> [DeclSyntax] {
guard let argument = node.argumentList.first?.expression.as(StringLiteralExprSyntax.self) else {
guard let argument = node.arguments.first?.expression.as(StringLiteralExprSyntax.self) else {
fatalError("boom")
}
return [
Expand Down