Skip to content

Commit bdf4633

Browse files
mosuemmosuem
committed
Format other packages as well
1 parent a130bf5 commit bdf4633

File tree

111 files changed

+5641
-2988
lines changed

Some content is hidden

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

111 files changed

+5641
-2988
lines changed

‎pkgs/characters/benchmark/benchmark.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ int replaceStrings() {
6666
const language = '한글';
6767
assert(language.length == 6);
6868
var chars = Characters(hangul);
69-
var replaced =
70-
chars.replaceAll(Characters(language), Characters('Hangul!'));
69+
var replaced = chars.replaceAll(
70+
Characters(language),
71+
Characters('Hangul!'),
72+
);
7173
count += replaced.string.length - hangul.length;
7274
}
7375
{

‎pkgs/characters/lib/src/characters_impl.dart‎

Lines changed: 63 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,26 @@ final class StringCharacters extends Iterable<String> implements Characters {
3030
String get first => string.isEmpty
3131
? throw StateError('No element')
3232
: string.substring(
33-
0, Breaks(string, 0, string.length, stateSoTNoBreak).nextBreak());
33+
0,
34+
Breaks(string, 0, string.length, stateSoTNoBreak).nextBreak(),
35+
);
3436

3537
@override
3638
String get last => string.isEmpty
3739
? throw StateError('No element')
3840
: string.substring(
39-
BackBreaks(string, string.length, 0, stateEoTNoBreak).nextBreak());
41+
BackBreaks(string, string.length, 0, stateEoTNoBreak).nextBreak(),
42+
);
4043

4144
@override
4245
String get single {
4346
if (string.isEmpty) throw StateError('No element');
44-
var firstEnd =
45-
Breaks(string, 0, string.length, stateSoTNoBreak).nextBreak();
47+
var firstEnd = Breaks(
48+
string,
49+
0,
50+
string.length,
51+
stateSoTNoBreak,
52+
).nextBreak();
4653
if (firstEnd == string.length) return string;
4754
throw StateError('Too many elements');
4855
}
@@ -80,8 +87,10 @@ final class StringCharacters extends Iterable<String> implements Characters {
8087
}
8188

8289
@override
83-
String lastWhere(bool Function(String element) test,
84-
{String Function()? orElse}) {
90+
String lastWhere(
91+
bool Function(String element) test, {
92+
String Function()? orElse,
93+
}) {
8594
var cursor = string.length;
8695
var brk = BackBreaks(string, cursor, 0, stateEoTNoBreak);
8796
var next = 0;
@@ -116,9 +125,12 @@ final class StringCharacters extends Iterable<String> implements Characters {
116125
bool contains(Object? singleCharacterString) {
117126
if (singleCharacterString is! String) return false;
118127
if (singleCharacterString.isEmpty) return false;
119-
var next = Breaks(singleCharacterString, 0, singleCharacterString.length,
120-
stateSoTNoBreak)
121-
.nextBreak();
128+
var next = Breaks(
129+
singleCharacterString,
130+
0,
131+
singleCharacterString.length,
132+
stateSoTNoBreak,
133+
).nextBreak();
122134
if (next != singleCharacterString.length) return false;
123135
// [singleCharacterString] is single grapheme cluster.
124136
return _indexOf(string, singleCharacterString, 0, string.length) >= 0;
@@ -443,10 +455,18 @@ class StringCharacterRange implements CharacterRange {
443455

444456
StringCharacterRange(String string) : this._(string, 0, 0);
445457

446-
factory StringCharacterRange.at(String string, int startIndex,
447-
[int? endIndex]) {
458+
factory StringCharacterRange.at(
459+
String string,
460+
int startIndex, [
461+
int? endIndex,
462+
]) {
448463
RangeError.checkValidRange(
449-
startIndex, endIndex, string.length, 'startIndex', 'endIndex');
464+
startIndex,
465+
endIndex,
466+
string.length,
467+
'startIndex',
468+
'endIndex',
469+
);
450470
return _expandRange(string, startIndex, endIndex ?? startIndex);
451471
}
452472

@@ -827,7 +847,10 @@ class StringCharacterRange implements CharacterRange {
827847
var index = _indexOf(_string, patternString, _start, _end);
828848
if (index >= 0) {
829849
replaced = _string.replaceRange(
830-
index, index + patternString.length, replacementString);
850+
index,
851+
index + patternString.length,
852+
replacementString,
853+
);
831854
} else {
832855
return null;
833856
}
@@ -842,7 +865,12 @@ class StringCharacterRange implements CharacterRange {
842865
var replacementString = replacement.string;
843866
if (patternString.isEmpty) {
844867
var replaced = _explodeReplace(
845-
_string, _start, _end, replacementString, replacementString);
868+
_string,
869+
_start,
870+
_end,
871+
replacementString,
872+
replacementString,
873+
);
846874
var newEnd = replaced.length - (_string.length - _end);
847875
return _expandRange(replaced, _start, newEnd);
848876
}
@@ -869,7 +897,10 @@ class StringCharacterRange implements CharacterRange {
869897
var replacementString = replacement.string;
870898
var resultString = _string.replaceRange(_start, _end, replacementString);
871899
return _expandRange(
872-
resultString, _start, _start + replacementString.length);
900+
resultString,
901+
_start,
902+
_start + replacementString.length,
903+
);
873904
}
874905

875906
/// Expands a range if its start or end are not grapheme cluster boundaries.
@@ -1011,8 +1042,13 @@ class StringCharacterRange implements CharacterRange {
10111042
}
10121043
}
10131044

1014-
String _explodeReplace(String string, int start, int end,
1015-
String internalReplacement, String outerReplacement) {
1045+
String _explodeReplace(
1046+
String string,
1047+
int start,
1048+
int end,
1049+
String internalReplacement,
1050+
String outerReplacement,
1051+
) {
10161052
if (start == end) {
10171053
return string.replaceRange(start, start, outerReplacement);
10181054
}
@@ -1052,7 +1088,11 @@ int _indexOf(String source, String pattern, int start, int end) {
10521088
if (index > realEnd) return -1;
10531089
if (isGraphemeClusterBoundary(source, start, end, index) &&
10541090
isGraphemeClusterBoundary(
1055-
source, start, end, index + patternLength)) {
1091+
source,
1092+
start,
1093+
end,
1094+
index + patternLength,
1095+
)) {
10561096
return index;
10571097
}
10581098
start = index + 1;
@@ -1094,7 +1134,11 @@ int _lastIndexOf(String source, String pattern, int start, int end) {
10941134
if (index < start) return -1;
10951135
if (isGraphemeClusterBoundary(source, start, end, index) &&
10961136
isGraphemeClusterBoundary(
1097-
source, start, end, index + patternLength)) {
1137+
source,
1138+
start,
1139+
end,
1140+
index + patternLength,
1141+
)) {
10981142
return index;
10991143
}
11001144
realEnd = index - 1;

‎pkgs/characters/lib/src/grapheme_clusters/breaks.dart‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,14 @@ class BackBreaks {
260260
if (preState >= stateLookaheadRegionalEven) {
261261
// Result is always one of one of flagBreak or flagNoBreak.
262262
assert(
263-
preState == (stateLookaheadRegionalOdd | flagLookahead) ||
264-
preState == (stateLookaheadRegionalEven | flagLookahead),
265-
preState);
266-
assert(state == (stateRegionalEven | flagNoBreak) ||
267-
state == (stateRegionalOdd | flagBreak));
263+
preState == (stateLookaheadRegionalOdd | flagLookahead) ||
264+
preState == (stateLookaheadRegionalEven | flagLookahead),
265+
preState,
266+
);
267+
assert(
268+
state == (stateRegionalEven | flagNoBreak) ||
269+
state == (stateRegionalOdd | flagBreak),
270+
);
268271
// Always reset cursor for regional lookahead.
269272
// (Could detect stateRegionalOdd, decrease cursor two positions and
270273
// switch to stateRegionalEven. Not worth the extra code.)
@@ -358,8 +361,11 @@ int previousBreak(String text, int start, int end, int index) {
358361
}
359362
}
360363
return BackBreaks(
361-
text, cursorBefore, start, moveBack(stateEoTNoBreak, category))
362-
.nextBreak();
364+
text,
365+
cursorBefore,
366+
start,
367+
moveBack(stateEoTNoBreak, category),
368+
).nextBreak();
363369
}
364370
return index;
365371
}
@@ -399,18 +405,24 @@ int nextBreak(String text, int start, int end, int index) {
399405
breaks.state = stateRegionalEven;
400406
} else {
401407
// Was triggered by ZWJ+Pic or InCB={Extend|Linked}+InCB=Consonant.
402-
assert(lookbehindState == (stateLookaheadZWJPictographic | flagLookahead) ||
403-
lookbehindState == (stateLookaheadInC | flagLookahead) ||
404-
lookbehindState == (stateLookaheadInCL | flagLookahead));
408+
assert(
409+
lookbehindState == (stateLookaheadZWJPictographic | flagLookahead) ||
410+
lookbehindState == (stateLookaheadInC | flagLookahead) ||
411+
lookbehindState == (stateLookaheadInCL | flagLookahead),
412+
);
405413
// If starting in lookahead state ZWJ+Pic, and not breaking,
406414
// final backwards state is Pic.
407-
assert(lookbehindState != (stateLookaheadZWJPictographic | flagLookahead) ||
408-
backBreaks.state == statePictographic);
415+
assert(
416+
lookbehindState != (stateLookaheadZWJPictographic | flagLookahead) ||
417+
backBreaks.state == statePictographic,
418+
);
409419
// If starting in lookahead state InC or InCL, and not breaking,
410420
// final backwards state is Inc.
411-
assert(lookbehindState != (stateLookaheadInC | flagLookahead) &&
412-
lookbehindState != (stateLookaheadInCL | flagLookahead) ||
413-
backBreaks.state == stateInC);
421+
assert(
422+
lookbehindState != (stateLookaheadInC | flagLookahead) &&
423+
lookbehindState != (stateLookaheadInCL | flagLookahead) ||
424+
backBreaks.state == stateInC,
425+
);
414426
// In both cases, that's the same as the forward state
415427
// at the point that triggered the look-behind.
416428
breaks.state = backBreaks.state;

‎pkgs/characters/test/breaks_test.dart‎

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,11 @@ void main() {
7474

7575
for (var i = 0; i <= input.length; i++) {
7676
var actualBreak = nextBreak(input, 0, input.length, i);
77-
expect(actualBreak, nextExpectedBreak,
78-
reason: 'at $i: $description$kind');
77+
expect(
78+
actualBreak,
79+
nextExpectedBreak,
80+
reason: 'at $i: $description$kind',
81+
);
7982
if (i == nextExpectedBreak && i < input.length) {
8083
nextExpectedBreak += variantParts[partCursor].length;
8184
partCursor++;
@@ -107,8 +110,11 @@ void main() {
107110
}
108111
}
109112
var actualBreak = previousBreak(input, 0, input.length, i);
110-
expect(actualBreak, expectedBreak,
111-
reason: 'at $i: $description$kind');
113+
expect(
114+
actualBreak,
115+
expectedBreak,
116+
reason: 'at $i: $description$kind',
117+
);
112118
}
113119
});
114120
}
@@ -128,9 +134,11 @@ void main() {
128134
var nextBreak = 0;
129135

130136
for (var i = 0; i <= input.length; i++) {
131-
expect(isGraphemeClusterBoundary(input, 0, input.length, i),
132-
i == nextBreak,
133-
reason: 'at $i: $description');
137+
expect(
138+
isGraphemeClusterBoundary(input, 0, input.length, i),
139+
i == nextBreak,
140+
reason: 'at $i: $description',
141+
);
134142

135143
if (i == nextBreak && i < input.length) {
136144
nextBreak += variantParts[partCursor++].length;
@@ -210,17 +218,23 @@ void main() {
210218
continue;
211219
}
212220
// No unexpected output states.
213-
expect(states, contains(newState),
214-
reason: '($state,$c): Unexpected output state');
221+
expect(
222+
states,
223+
contains(newState),
224+
reason: '($state,$c): Unexpected output state',
225+
);
215226
// Add to fringe the first time a state is seen.
216227
if (unreachableStates.remove(newState)) {
217228
nextStepList.add(newState);
218229
}
219230
}
220231
}
221232
if (unreachableStates.isNotEmpty) {
222-
expect(unreachableStates.map(stateShortName).toList(), isEmpty,
223-
reason: 'Should be reachable');
233+
expect(
234+
unreachableStates.map(stateShortName).toList(),
235+
isEmpty,
236+
reason: 'Should be reachable',
237+
);
224238
}
225239
if (verbose) print('Forward states reachable in $step steps');
226240
});
@@ -273,8 +287,11 @@ void main() {
273287
break;
274288
}
275289
}
276-
expect(eqClasses, everyElement(hasLength(1)),
277-
reason: 'Not distinguishable in $stateCount steps');
290+
expect(
291+
eqClasses,
292+
everyElement(hasLength(1)),
293+
reason: 'Not distinguishable in $stateCount steps',
294+
);
278295
});
279296

280297
test('States backward reachable', () {
@@ -330,8 +347,11 @@ void main() {
330347
}
331348
}
332349
if (unreachableStates.isNotEmpty) {
333-
expect(unreachableStates.map(stateShortName).toList(), isEmpty,
334-
reason: 'Should be reachable, not reached in $step steps');
350+
expect(
351+
unreachableStates.map(stateShortName).toList(),
352+
isEmpty,
353+
reason: 'Should be reachable, not reached in $step steps',
354+
);
335355
}
336356
});
337357

@@ -349,7 +369,7 @@ void main() {
349369
// Assume that any lookahead state can be distinguished from any other
350370
// state.
351371
var states = [
352-
for (var i = 0; i < backStateLimit; i += automatonRowLength) i
372+
for (var i = 0; i < backStateLimit; i += automatonRowLength) i,
353373
];
354374
var eqClasses = [states];
355375
var eq = Equivalence(eqClasses);

0 commit comments

Comments
 (0)