@@ -1945,11 +1945,7 @@ class RequestMessage implements IncomingMessage, ToJsonable {
1945
1945
final clientRequestTimeJson = json['clientRequestTime' ];
1946
1946
final clientRequestTime = clientRequestTimeJson as int ? ;
1947
1947
final idJson = json['id' ];
1948
- final id = idJson is int
1949
- ? Either2 <int , String >.t1 (idJson)
1950
- : (idJson is String
1951
- ? Either2 <int , String >.t2 (idJson)
1952
- : (throw '''$idJson was not one of (int, String)''' ));
1948
+ final id = _eitherIntString (idJson);
1953
1949
final jsonrpcJson = json['jsonrpc' ];
1954
1950
final jsonrpc = jsonrpcJson as String ;
1955
1951
final methodJson = json['method' ];
@@ -2226,13 +2222,7 @@ class ResponseMessage implements Message, ToJsonable {
2226
2222
? ResponseError .fromJson (errorJson as Map <String , Object ?>)
2227
2223
: null ;
2228
2224
final idJson = json['id' ];
2229
- final id = idJson == null
2230
- ? null
2231
- : (idJson is int
2232
- ? Either2 <int , String >.t1 (idJson)
2233
- : (idJson is String
2234
- ? Either2 <int , String >.t2 (idJson)
2235
- : (throw '''$idJson was not one of (int, String)''' )));
2225
+ final id = idJson == null ? null : _eitherIntString (idJson);
2236
2226
final jsonrpcJson = json['jsonrpc' ];
2237
2227
final jsonrpc = jsonrpcJson as String ;
2238
2228
final resultJson = json['result' ];
@@ -2574,3 +2564,11 @@ class ValidateRefactorResult implements ToJsonable {
2574
2564
@override
2575
2565
String toString () => jsonEncoder.convert (toJson ());
2576
2566
}
2567
+
2568
+ Either2 <int , String > _eitherIntString (Object ? value) {
2569
+ return value is int
2570
+ ? Either2 .t1 (value)
2571
+ : value is String
2572
+ ? Either2 .t2 (value)
2573
+ : throw '$value was not one of (int, String)' ;
2574
+ }
0 commit comments