Handle UTC flag during copyWith #45

Author: jogboms

lib/src/extensions.dart

@@ -180,16 +180,27 @@ extension DateTimeTimeExtension on DateTime {
     int? millisecond,
     int? microsecond,
   }) {
-    return DateTime(
-      year ?? this.year,
-      month ?? this.month,
-      day ?? this.day,
-      hour ?? this.hour,
-      minute ?? this.minute,
-      second ?? this.second,
-      millisecond ?? this.millisecond,
-      microsecond ?? this.microsecond,
-    );
+    return isUtc
+        ? DateTime.utc(
+            year ?? this.year,
+            month ?? this.month,
+            day ?? this.day,
+            hour ?? this.hour,
+            minute ?? this.minute,
+            second ?? this.second,
+            millisecond ?? this.millisecond,
+            microsecond ?? this.microsecond,
+          )
+        : DateTime(
+            year ?? this.year,
+            month ?? this.month,
+            day ?? this.day,
+            hour ?? this.hour,
+            minute ?? this.minute,
+            second ?? this.second,
+            millisecond ?? this.millisecond,
+            microsecond ?? this.microsecond,
+          );
   }
 }
 

pubspec.yaml

@@ -11,4 +11,4 @@ dev_dependencies:
   test: ^1.16.5
   test_coverage:
     git:
-      url: https://github.com/jogboms/test-coverage.git
+      url: https://github.com/timsneath/test-coverage.git

test/time_test.dart

@@ -489,26 +489,34 @@ void main() {
           expect(expected.millisecond, 0);
           expect(expected.microsecond, 12);
         });
-      });
 
-      test('with null values', () {
-        final initial = DateTime(2019, 2, 4, 24, 50, 45, 1, 1);
-        final year = initial.copyWith(year: 2021);
-        expect(year.year, 2021);
-        final month = initial.copyWith(month: 10);
-        expect(month.month, 10);
-        final day = initial.copyWith(day: 28);
-        expect(day.day, 28);
-        final hour = initial.copyWith(hour: 12);
-        expect(hour.hour, 12);
-        final minute = initial.copyWith(minute: 45);
-        expect(minute.minute, 45);
-        final second = initial.copyWith(second: 10);
-        expect(second.second, 10);
-        final millisecond = initial.copyWith(millisecond: 0);
-        expect(millisecond.millisecond, 0);
-        final microsecond = initial.copyWith(microsecond: 12);
-        expect(microsecond.microsecond, 12);
+        test('with null values', () {
+          final initial = DateTime(2019, 2, 4, 24, 50, 45, 1, 1);
+          final year = initial.copyWith(year: 2021);
+          expect(year.year, 2021);
+          final month = initial.copyWith(month: 10);
+          expect(month.month, 10);
+          final day = initial.copyWith(day: 28);
+          expect(day.day, 28);
+          final hour = initial.copyWith(hour: 12);
+          expect(hour.hour, 12);
+          final minute = initial.copyWith(minute: 45);
+          expect(minute.minute, 45);
+          final second = initial.copyWith(second: 10);
+          expect(second.second, 10);
+          final millisecond = initial.copyWith(millisecond: 0);
+          expect(millisecond.millisecond, 0);
+          final microsecond = initial.copyWith(microsecond: 12);
+          expect(microsecond.microsecond, 12);
+        });
+
+        test('copyWith should save isUtc', () async {
+          final now = DateTime.now().toUtc();
+          expect(now.isUtc, isTrue);
+
+          final later = now.copyWith(hour: now.hour + 3);
+          expect(later.isUtc, isTrue);
+        });
       });
     });
   });