cleanup

google · Aug 8, 2024 · 5894d4f · 5894d4f
1 parent de7da92
commit 5894d4f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/json_serializable/lib/src/constants.dart b/json_serializable/lib/src/constants.dart
@@ -5,7 +5,7 @@
 /// Name used for closure argument when generating calls to `map`.
 const closureArg = 'e';
 
-const localVal = 'val';
+const generatedLocalVarName = 'val';
 
 const converterOrKeyInstructions = r'''
 * Use `JsonConverter`

diff --git a/json_serializable/lib/src/encoder_helper.dart b/json_serializable/lib/src/encoder_helper.dart
@@ -122,10 +122,13 @@ mixin EncodeHelper implements HelperCore {
       ..writeAll(fields.map((field) {
         final access = _fieldAccess(field);
 
+        final keyExpression = safeNameAccess(field);
+        final valueExpression = _serializeField(field, access);
+
         final keyValuePair = _canWriteJsonWithoutNullCheck(field)
-            ? '${safeNameAccess(field)}: ${_serializeField(field, access)}'
-            : 'if (${_serializeField(field, access)} case final $localVal?) '
-                '${safeNameAccess(field)}: $localVal';
+            ? '$keyExpression: $valueExpression'
+            : 'if ($valueExpression case final $generatedLocalVarName?) '
+                '$keyExpression: $generatedLocalVarName';
         return '        $keyValuePair,\n';
       }))
       ..writeln('};');

diff --git a/json_serializable/test/custom_configuration_test.dart b/json_serializable/test/custom_configuration_test.dart
@@ -213,7 +213,7 @@ Map<String, dynamic> _$TrivialNestedNonNullableToJson(
   group('includeIfNull', () {
     test('some', () async {
       final output = await runForElementNamed('IncludeIfNullAll');
-      expect(output, isNot(contains(localVal)));
+      expect(output, isNot(contains(generatedLocalVarName)));
     });
   });
 }