@@ -47,7 +47,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
47
47
48
48
switch node. name. text {
49
49
case " Array " :
50
- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
50
+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
51
51
newNode = nil
52
52
break
53
53
}
@@ -58,7 +58,8 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
58
58
)
59
59
60
60
case " Dictionary " :
61
- guard case ( . type( let type0Argument) , . type( let type1Argument) ) = exactlyTwoChildren ( of: genericArgumentList)
61
+ guard let arguments = exactlyTwoChildren ( of: genericArgumentList) ,
62
+ case ( . type( let type0Argument) , . type( let type1Argument) ) = ( arguments. 0 . argument, arguments. 1 . argument)
62
63
else {
63
64
newNode = nil
64
65
break
@@ -75,7 +76,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
75
76
newNode = nil
76
77
break
77
78
}
78
- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
79
+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
79
80
newNode = nil
80
81
break
81
82
}
@@ -138,7 +139,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
138
139
139
140
switch expression. baseName. text {
140
141
case " Array " :
141
- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
142
+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
142
143
newNode = nil
143
144
break
144
145
}
@@ -150,7 +151,8 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
150
151
newNode = ExprSyntax ( arrayTypeExpr)
151
152
152
153
case " Dictionary " :
153
- guard case ( . type( let type0Argument) , . type( let type1Argument) ) = exactlyTwoChildren ( of: genericArgumentList)
154
+ guard let arguments = exactlyTwoChildren ( of: genericArgumentList) ,
155
+ case ( . type( let type0Argument) , . type( let type1Argument) ) = ( arguments. 0 . argument, arguments. 1 . argument)
154
156
else {
155
157
newNode = nil
156
158
break
@@ -165,7 +167,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
165
167
newNode = ExprSyntax ( dictTypeExpr)
166
168
167
169
case " Optional " :
168
- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
170
+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
169
171
newNode = nil
170
172
break
171
173
}
0 commit comments