@@ -125,18 +125,12 @@ class ConstantSyntax extends JsonObjectSyntax {
125125 List <Object > path = const [],
126126 }) {
127127 final result = ConstantSyntax ._fromJson (json, path: path);
128- if (result.isInstanceConstant) {
129- return result.asInstanceConstant;
130- }
131- if (result.isNullConstant) {
132- return result.asNullConstant;
133- }
134- if (result.isStringConstant) {
135- return result.asStringConstant;
136- }
137128 if (result.isBoolConstant) {
138129 return result.asBoolConstant;
139130 }
131+ if (result.isInstanceConstant) {
132+ return result.asInstanceConstant;
133+ }
140134 if (result.isIntConstant) {
141135 return result.asIntConstant;
142136 }
@@ -146,6 +140,12 @@ class ConstantSyntax extends JsonObjectSyntax {
146140 if (result.isMapConstant) {
147141 return result.asMapConstant;
148142 }
143+ if (result.isNullConstant) {
144+ return result.asNullConstant;
145+ }
146+ if (result.isStringConstant) {
147+ return result.asStringConstant;
148+ }
149149 return result;
150150 }
151151
@@ -344,7 +344,7 @@ class InstanceConstantSyntax extends ConstantSyntax {
344344 }) : super ._fromJson ();
345345
346346 InstanceConstantSyntax ({JsonObjectSyntax ? value, super .path = const []})
347- : super (type: 'Instance ' ) {
347+ : super (type: 'instance ' ) {
348348 _value = value;
349349 json.sortOnKey ();
350350 }
@@ -382,7 +382,7 @@ class InstanceConstantSyntax extends ConstantSyntax {
382382}
383383
384384extension InstanceConstantSyntaxExtension on ConstantSyntax {
385- bool get isInstanceConstant => type == 'Instance ' ;
385+ bool get isInstanceConstant => type == 'instance ' ;
386386
387387 InstanceConstantSyntax get asInstanceConstant =>
388388 InstanceConstantSyntax .fromJson (json, path: path);
@@ -624,7 +624,7 @@ class NullConstantSyntax extends ConstantSyntax {
624624 super .path,
625625 }) : super ._fromJson ();
626626
627- NullConstantSyntax ({super .path = const []}) : super (type: 'Null ' );
627+ NullConstantSyntax ({super .path = const []}) : super (type: 'null ' );
628628
629629 @override
630630 List <String > validate () => [
@@ -636,7 +636,7 @@ class NullConstantSyntax extends ConstantSyntax {
636636}
637637
638638extension NullConstantSyntaxExtension on ConstantSyntax {
639- bool get isNullConstant => type == 'Null ' ;
639+ bool get isNullConstant => type == 'null ' ;
640640
641641 NullConstantSyntax get asNullConstant =>
642642 NullConstantSyntax .fromJson (json, path: path);
@@ -916,7 +916,7 @@ class StringConstantSyntax extends ConstantSyntax {
916916 }) : super ._fromJson ();
917917
918918 StringConstantSyntax ({required String value, super .path = const []})
919- : super (type: 'String ' ) {
919+ : super (type: 'string ' ) {
920920 _value = value;
921921 json.sortOnKey ();
922922 }
@@ -944,7 +944,7 @@ class StringConstantSyntax extends ConstantSyntax {
944944}
945945
946946extension StringConstantSyntaxExtension on ConstantSyntax {
947- bool get isStringConstant => type == 'String ' ;
947+ bool get isStringConstant => type == 'string ' ;
948948
949949 StringConstantSyntax get asStringConstant =>
950950 StringConstantSyntax .fromJson (json, path: path);
0 commit comments