Polyfill: Fix formatting PlainDateTime with both dateStyle and timeStyle

Adjusting the options to not print the time zone name in timeStyle long or
full (#2795) inadvertently regressed formatting a PlainDateTime with both
dateStyle and timeStyle specified.

See: #3061

Author: ptomato

polyfill/lib/intl.mjs

@@ -472,6 +472,19 @@ function datetimeAmend(originalOptions) {
     // Try to fake what timeStyle should do if not printing the time zone name
     delete options.timeStyle;
     ObjectAssign(options, { hour: 'numeric', minute: '2-digit', second: '2-digit' });
+
+    // If moving to a fake timeStyle while dateStyle is present, we also have to
+    // move to a fake dateStyle. dateStyle is mutually exclusive with hour etc.
+    if (options.dateStyle) {
+      const dateStyleHacks = {
+        short: { year: 'numeric', month: 'numeric', day: 'numeric' },
+        medium: { year: 'numeric', month: 'short', day: 'numeric' },
+        long: { year: 'numeric', month: 'long', day: 'numeric' },
+        full: { year: 'numeric', month: 'long', day: 'numeric', weekday: 'long' }
+      };
+      ObjectAssign(options, dateStyleHacks[options.dateStyle]);
+      delete options.dateStyle;
+    }
   }
   if (!hasTimeOptions(options) && !hasDateOptions(options)) {
     if (hasAnyDateTimeOptions(originalOptions)) {