Skip to content

Commit 14c241a

Browse files
mosuemmosuem
committed
Format all
1 parent b449bd7 commit 14c241a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+782
-825
lines changed

‎pkgs/intl4x/lib/src/collation/collation_4x.dart

+13-10
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@ import 'collation_impl.dart';
1111
import 'collation_options.dart';
1212

1313
CollationImpl getCollator4X(
14-
Locale locale, Data data, CollationOptions options) =>
15-
Collation4X(locale, data, options);
14+
Locale locale,
15+
Data data,
16+
CollationOptions options,
17+
) => Collation4X(locale, data, options);
1618

1719
class Collation4X extends CollationImpl {
1820
final icu.Collator _collator;
1921

2022
Collation4X(super.locale, Data data, super.options)
21-
: _collator = icu.Collator(
22-
data.to4X(),
23-
locale.to4X(),
24-
options.to4xOptions(),
25-
);
23+
: _collator = icu.Collator(
24+
data.to4X(),
25+
locale.to4X(),
26+
options.to4xOptions(),
27+
);
2628

2729
@override
2830
int compareImpl(String a, String b) => _collator.compare(a, b);
@@ -47,9 +49,10 @@ extension on CollationOptions {
4749
null => icu.CollatorStrength.tertiary,
4850
};
4951

50-
final icuCaseLevel = sensitivity == Sensitivity.caseSensitivity
51-
? icu.CollatorCaseLevel.on
52-
: icu.CollatorCaseLevel.off;
52+
final icuCaseLevel =
53+
sensitivity == Sensitivity.caseSensitivity
54+
? icu.CollatorCaseLevel.on
55+
: icu.CollatorCaseLevel.off;
5356

5457
return icu.CollatorOptions(
5558
strength: icuStrength,

‎pkgs/intl4x/lib/src/collation/collation_ecma.dart

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ CollationImpl? getCollatorECMA(
1616
Locale locale,
1717
CollationOptions options,
1818
LocaleMatcher localeMatcher,
19-
) =>
20-
CollationECMA.tryToBuild(locale, options, localeMatcher);
19+
) => CollationECMA.tryToBuild(locale, options, localeMatcher);
2120

2221
extension type Collator._(JSObject _) implements JSObject {
2322
external Collator([JSArray<JSString> locales, JSAny options]);
2423
external int compare(String a, String b);
2524

2625
external static JSArray<JSString> supportedLocalesOf(
27-
JSArray<JSString> locales,
28-
[JSAny options]);
26+
JSArray<JSString> locales, [
27+
JSAny options,
28+
]);
2929
}
3030

3131
class CollationECMA extends CollationImpl {
@@ -47,11 +47,10 @@ class CollationECMA extends CollationImpl {
4747
Locale locale,
4848
) {
4949
final o = {'localeMatcher': localeMatcher.jsName}.jsify()!;
50-
return Collator.supportedLocalesOf([locale.toLanguageTag().toJS].toJS, o)
51-
.toDart
52-
.whereType<String>()
53-
.map(Locale.parse)
54-
.toList();
50+
return Collator.supportedLocalesOf(
51+
[locale.toLanguageTag().toJS].toJS,
52+
o,
53+
).toDart.whereType<String>().map(Locale.parse).toList();
5554
}
5655

5756
@override
@@ -65,7 +64,8 @@ class CollationECMA extends CollationImpl {
6564
}
6665

6766
extension on CollationOptions {
68-
JSAny toJsOptions() => {
67+
JSAny toJsOptions() =>
68+
{
6969
'localeMatcher': localeMatcher.jsName,
7070
'usage': usage.name,
7171
if (sensitivity != null) 'sensitivity': sensitivity!.jsName,

‎pkgs/intl4x/lib/src/collation/collation_impl.dart

+9-10
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@ abstract class CollationImpl {
2929
CollationOptions options,
3030
LocaleMatcher localeMatcher,
3131
EcmaPolicy ecmaPolicy,
32-
) =>
33-
buildFormatter(
34-
locale,
35-
data,
36-
options,
37-
localeMatcher,
38-
ecmaPolicy,
39-
getCollatorECMA,
40-
getCollator4X,
41-
);
32+
) => buildFormatter(
33+
locale,
34+
data,
35+
options,
36+
localeMatcher,
37+
ecmaPolicy,
38+
getCollatorECMA,
39+
getCollator4X,
40+
);
4241

4342
/// Actual implementation of the [Collation.compare] method.
4443
int compareImpl(String a, String b);

‎pkgs/intl4x/lib/src/collation/collation_options.dart

+1-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ class CollationOptions {
4949
///
5050
/// Example: For the `de` locale, `['AE', 'Ä']` is the correct order for
5151
/// [Usage.search], but `['Ä', 'AE']` for [Usage.sort].
52-
enum Usage {
53-
search,
54-
sort;
55-
}
52+
enum Usage { search, sort }
5653

5754
/// Which differences in the strings should lead to non-zero result values.
5855
/// The default is [Sensitivity.variant] for usage [Usage.sort]; it's locale

‎pkgs/intl4x/lib/src/collation/collation_stub.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ import 'collation_impl.dart';
88

99
/// Stub for the conditional import
1010
CollationImpl? getCollatorECMA(
11-
Locale locale, CollationOptions options, LocaleMatcher localeMatcher) =>
12-
throw UnimplementedError('Cannot use ECMA outside of web environments.');
11+
Locale locale,
12+
CollationOptions options,
13+
LocaleMatcher localeMatcher,
14+
) => throw UnimplementedError('Cannot use ECMA outside of web environments.');

‎pkgs/intl4x/lib/src/collation/collation_stub_4x.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ import 'collation_impl.dart';
99

1010
/// Stub for the conditional import
1111
CollationImpl getCollator4X(
12-
Locale locale, Data data, CollationOptions options) =>
13-
throw UnimplementedError('Cannot use ICU4X in web environments.');
12+
Locale locale,
13+
Data data,
14+
CollationOptions options,
15+
) => throw UnimplementedError('Cannot use ICU4X in web environments.');

‎pkgs/intl4x/lib/src/data_4x.dart

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import 'data.dart';
88

99
extension DataProvider on Data {
1010
icu.DataProvider to4X() => switch (this) {
11-
AssetData() => icu.DataProvider.fromByteSlice(
12-
File((this as AssetData).key).readAsBytesSync().buffer),
13-
BundleData() => icu.DataProvider.compiled(),
14-
NoData() => icu.DataProvider.empty(),
15-
};
11+
AssetData() => icu.DataProvider.fromByteSlice(
12+
File((this as AssetData).key).readAsBytesSync().buffer,
13+
),
14+
BundleData() => icu.DataProvider.compiled(),
15+
NoData() => icu.DataProvider.empty(),
16+
};
1617
}

‎pkgs/intl4x/lib/src/datetime_format/datetime_format_4x.dart

+47-44
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ DateTimeFormatImpl getDateTimeFormatter4X(
1414
Locale locale,
1515
Data data,
1616
DateTimeFormatOptions options,
17-
) =>
18-
DateTimeFormat4X(locale, data, options);
17+
) => DateTimeFormat4X(locale, data, options);
1918

2019
class DateTimeFormat4X extends DateTimeFormatImpl {
2120
final icu.DateTimeFormatter? _dateTimeFormatter;
@@ -25,27 +24,29 @@ class DateTimeFormat4X extends DateTimeFormatImpl {
2524
final icu.DataProvider _data;
2625

2726
DateTimeFormat4X(super.locale, Data data, super.options)
28-
: _data = data.to4X(),
29-
_dateTimeFormatter = _setDateTimeFormatter(options, data, locale),
30-
_timeFormatter = options.timeFormatStyle != null
31-
? icu.TimeFormatter.withLength(
27+
: _data = data.to4X(),
28+
_dateTimeFormatter = _setDateTimeFormatter(options, data, locale),
29+
_timeFormatter =
30+
options.timeFormatStyle != null
31+
? icu.TimeFormatter.withLength(
3232
data.to4X(),
3333
locale.to4X(),
3434
options.dateFormatStyle?.timeTo4xOptions() ??
3535
icu.TimeLength.short,
3636
)
37-
: null,
38-
_dateFormatter = _setDateFormatter(options, data, locale),
39-
_zonedDateTimeFormatter = options.timeZone != null
40-
? icu.ZonedDateTimeFormatter.withLengths(
37+
: null,
38+
_dateFormatter = _setDateFormatter(options, data, locale),
39+
_zonedDateTimeFormatter =
40+
options.timeZone != null
41+
? icu.ZonedDateTimeFormatter.withLengths(
4142
data.to4X(),
4243
locale.to4X(),
4344
options.dateFormatStyle?.dateTo4xOptions() ??
4445
icu.DateLength.short, //TODO: Check defaults
4546
options.timeFormatStyle?.timeTo4xOptions() ??
4647
icu.TimeLength.short, //TODO: Check defaults
4748
)
48-
: null;
49+
: null;
4950

5051
static icu.DateTimeFormatter? _setDateTimeFormatter(
5152
DateTimeFormatOptions options,
@@ -101,8 +102,9 @@ class DateTimeFormat4X extends DateTimeFormatImpl {
101102
);
102103
if (_zonedDateTimeFormatter != null) {
103104
final ianaToBcp47Mapper = icu.IanaToBcp47Mapper(_data);
104-
final timeZone = icu.CustomTimeZone.empty()
105-
..trySetIanaTimeZoneId(ianaToBcp47Mapper, options.timeZone!);
105+
final timeZone =
106+
icu.CustomTimeZone.empty()
107+
..trySetIanaTimeZoneId(ianaToBcp47Mapper, options.timeZone!);
106108
return _zonedDateTimeFormatter.formatDatetimeWithCustomTimeZone(
107109
isoDateTime,
108110
timeZone,
@@ -115,46 +117,47 @@ class DateTimeFormat4X extends DateTimeFormatImpl {
115117
return _timeFormatter.formatDatetime(isoDateTime);
116118
} else {
117119
throw UnimplementedError(
118-
'Custom skeletons are not yet supported in ICU4X. '
119-
'Either date or time formatting has to be enabled.');
120+
'Custom skeletons are not yet supported in ICU4X. '
121+
'Either date or time formatting has to be enabled.',
122+
);
120123
}
121124
}
122125
}
123126

124127
extension on TimeFormatStyle {
125128
icu.TimeLength timeTo4xOptions() => switch (this) {
126-
TimeFormatStyle.full => icu.TimeLength.full,
127-
TimeFormatStyle.long => icu.TimeLength.long,
128-
TimeFormatStyle.medium => icu.TimeLength.medium,
129-
TimeFormatStyle.short => icu.TimeLength.short,
130-
};
129+
TimeFormatStyle.full => icu.TimeLength.full,
130+
TimeFormatStyle.long => icu.TimeLength.long,
131+
TimeFormatStyle.medium => icu.TimeLength.medium,
132+
TimeFormatStyle.short => icu.TimeLength.short,
133+
};
131134
icu.DateLength dateTo4xOptions() => switch (this) {
132-
TimeFormatStyle.full => icu.DateLength.full,
133-
TimeFormatStyle.long => icu.DateLength.long,
134-
TimeFormatStyle.medium => icu.DateLength.medium,
135-
TimeFormatStyle.short => icu.DateLength.short,
136-
};
135+
TimeFormatStyle.full => icu.DateLength.full,
136+
TimeFormatStyle.long => icu.DateLength.long,
137+
TimeFormatStyle.medium => icu.DateLength.medium,
138+
TimeFormatStyle.short => icu.DateLength.short,
139+
};
137140
}
138141

139142
extension on Calendar {
140143
icu.AnyCalendarKind to4x() => switch (this) {
141-
Calendar.buddhist => icu.AnyCalendarKind.buddhist,
142-
Calendar.chinese => icu.AnyCalendarKind.chinese,
143-
Calendar.coptic => icu.AnyCalendarKind.coptic,
144-
Calendar.dangi => icu.AnyCalendarKind.dangi,
145-
Calendar.ethioaa => icu.AnyCalendarKind.ethiopianAmeteAlem,
146-
Calendar.ethiopic => icu.AnyCalendarKind.ethiopian,
147-
Calendar.gregory => icu.AnyCalendarKind.gregorian,
148-
Calendar.hebrew => icu.AnyCalendarKind.hebrew,
149-
Calendar.indian => icu.AnyCalendarKind.indian,
150-
Calendar.islamic => icu.AnyCalendarKind.islamicObservational,
151-
Calendar.islamicUmalqura => icu.AnyCalendarKind.islamicUmmAlQura,
152-
Calendar.islamicTbla => icu.AnyCalendarKind.islamicTabular,
153-
Calendar.islamicCivil => icu.AnyCalendarKind.islamicCivil,
154-
Calendar.islamicRgsa => icu.AnyCalendarKind.islamicObservational,
155-
Calendar.iso8601 => icu.AnyCalendarKind.iso,
156-
Calendar.japanese => icu.AnyCalendarKind.japanese,
157-
Calendar.persian => icu.AnyCalendarKind.persian,
158-
Calendar.roc => icu.AnyCalendarKind.roc,
159-
};
144+
Calendar.buddhist => icu.AnyCalendarKind.buddhist,
145+
Calendar.chinese => icu.AnyCalendarKind.chinese,
146+
Calendar.coptic => icu.AnyCalendarKind.coptic,
147+
Calendar.dangi => icu.AnyCalendarKind.dangi,
148+
Calendar.ethioaa => icu.AnyCalendarKind.ethiopianAmeteAlem,
149+
Calendar.ethiopic => icu.AnyCalendarKind.ethiopian,
150+
Calendar.gregory => icu.AnyCalendarKind.gregorian,
151+
Calendar.hebrew => icu.AnyCalendarKind.hebrew,
152+
Calendar.indian => icu.AnyCalendarKind.indian,
153+
Calendar.islamic => icu.AnyCalendarKind.islamicObservational,
154+
Calendar.islamicUmalqura => icu.AnyCalendarKind.islamicUmmAlQura,
155+
Calendar.islamicTbla => icu.AnyCalendarKind.islamicTabular,
156+
Calendar.islamicCivil => icu.AnyCalendarKind.islamicCivil,
157+
Calendar.islamicRgsa => icu.AnyCalendarKind.islamicObservational,
158+
Calendar.iso8601 => icu.AnyCalendarKind.iso,
159+
Calendar.japanese => icu.AnyCalendarKind.japanese,
160+
Calendar.persian => icu.AnyCalendarKind.persian,
161+
Calendar.roc => icu.AnyCalendarKind.roc,
162+
};
160163
}

‎pkgs/intl4x/lib/src/datetime_format/datetime_format_ecma.dart

+17-16
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ DateTimeFormatImpl? getDateTimeFormatterECMA(
1313
Locale locale,
1414
DateTimeFormatOptions options,
1515
LocaleMatcher localeMatcher,
16-
) =>
17-
_DateTimeFormatECMA.tryToBuild(locale, options, localeMatcher);
16+
) => _DateTimeFormatECMA.tryToBuild(locale, options, localeMatcher);
1817

1918
@JS('Intl.DateTimeFormat')
2019
extension type DateTimeFormat._(JSObject _) implements JSObject {
@@ -40,7 +39,7 @@ extension type Date._(JSObject _) implements JSObject {
4039

4140
external factory Date.fromTimeStamp(int timeStamp);
4241

43-
// ignore: non_constant_identifier_names
42+
// ignore: non_constant_identifier_names
4443
external static int UTC(
4544
int year,
4645
int monthIndex,
@@ -72,28 +71,30 @@ class _DateTimeFormatECMA extends DateTimeFormatImpl {
7271
) {
7372
final o = {'localeMatcher': localeMatcher.jsName}.jsify()!;
7473
return DateTimeFormat.supportedLocalesOf(
75-
[locale.toLanguageTag().toJS].toJS, o)
76-
.toDart
77-
.whereType<String>()
78-
.map(Locale.parse)
79-
.toList();
74+
[locale.toLanguageTag().toJS].toJS,
75+
o,
76+
).toDart.whereType<String>().map(Locale.parse).toList();
8077
}
8178

8279
@override
83-
String formatImpl(DateTime datetime) =>
84-
DateTimeFormat([locale.toLanguageTag().toJS].toJS, options.toJsOptions())
85-
.format(datetime.toJs());
80+
String formatImpl(DateTime datetime) => DateTimeFormat(
81+
[locale.toLanguageTag().toJS].toJS,
82+
options.toJsOptions(),
83+
).format(datetime.toJs());
8684
}
8785

8886
extension on DateTime {
89-
Date toJs() => isUtc
90-
? Date.fromTimeStamp(
91-
Date.UTC(year, month - 1, day, hour, minute, second, millisecond))
92-
: Date(year, month - 1, day, hour, minute, second, millisecond);
87+
Date toJs() =>
88+
isUtc
89+
? Date.fromTimeStamp(
90+
Date.UTC(year, month - 1, day, hour, minute, second, millisecond),
91+
)
92+
: Date(year, month - 1, day, hour, minute, second, millisecond);
9393
}
9494

9595
extension on DateTimeFormatOptions {
96-
JSAny toJsOptions() => {
96+
JSAny toJsOptions() =>
97+
{
9798
'localeMatcher': localeMatcher.jsName,
9899
if (dateFormatStyle != null) 'dateStyle': dateFormatStyle!.name,
99100
if (timeFormatStyle != null) 'timeStyle': timeFormatStyle!.name,

‎pkgs/intl4x/lib/src/datetime_format/datetime_format_impl.dart

+9-10
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ abstract class DateTimeFormatImpl {
2929
DateTimeFormatOptions options,
3030
LocaleMatcher localeMatcher,
3131
EcmaPolicy ecmaPolicy,
32-
) =>
33-
buildFormatter(
34-
locale,
35-
data,
36-
options,
37-
localeMatcher,
38-
ecmaPolicy,
39-
getDateTimeFormatterECMA,
40-
getDateTimeFormatter4X,
41-
);
32+
) => buildFormatter(
33+
locale,
34+
data,
35+
options,
36+
localeMatcher,
37+
ecmaPolicy,
38+
getDateTimeFormatterECMA,
39+
getDateTimeFormatter4X,
40+
);
4241
}

0 commit comments

Comments
 (0)