@@ -47,7 +47,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
4747
4848 switch node. name. text {
4949 case " Array " :
50- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
50+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
5151 newNode = nil
5252 break
5353 }
@@ -58,7 +58,8 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
5858 )
5959
6060 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)
6263 else {
6364 newNode = nil
6465 break
@@ -75,7 +76,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
7576 newNode = nil
7677 break
7778 }
78- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
79+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
7980 newNode = nil
8081 break
8182 }
@@ -138,7 +139,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
138139
139140 switch expression. baseName. text {
140141 case " Array " :
141- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
142+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
142143 newNode = nil
143144 break
144145 }
@@ -150,7 +151,8 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
150151 newNode = ExprSyntax ( arrayTypeExpr)
151152
152153 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)
154156 else {
155157 newNode = nil
156158 break
@@ -165,7 +167,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
165167 newNode = ExprSyntax ( dictTypeExpr)
166168
167169 case " Optional " :
168- guard case . type( let typeArgument) = genericArgumentList. firstAndOnly else {
170+ guard case . type( let typeArgument) = genericArgumentList. firstAndOnly. argument else {
169171 newNode = nil
170172 break
171173 }
0 commit comments