Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
Remove unnecessary null checks in dev/tools (#118845)
Browse files Browse the repository at this point in the history
  • Loading branch information
goderbauer committed Jan 20, 2023
1 parent 98c18ca commit 99b5262
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 31 deletions.
2 changes: 0 additions & 2 deletions dev/tools/dartdoc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,6 @@ Iterable<String> libraryRefs() sync* {
}

void printStream(Stream<List<int>> stream, { String prefix = '', List<Pattern> filter = const <Pattern>[] }) {
assert(prefix != null);
assert(filter != null);
stream
.transform<String>(utf8.decoder)
.transform<String>(const LineSplitter())
Expand Down
6 changes: 2 additions & 4 deletions dev/tools/gen_keycodes/lib/android_code_gen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ class AndroidCodeGenerator extends PlatformCodeGenerator {
String get _androidScanCodeMap {
final StringBuffer androidScanCodeMap = StringBuffer();
for (final PhysicalKeyEntry entry in keyData.entries) {
if (entry.androidScanCodes != null) {
for (final int code in entry.androidScanCodes.cast<int>()) {
androidScanCodeMap.writeln(' put(${toHex(code, digits: 10)}L, ${toHex(entry.usbHidCode, digits: 10)}L); // ${entry.constantName}');
}
for (final int code in entry.androidScanCodes.cast<int>()) {
androidScanCodeMap.writeln(' put(${toHex(code, digits: 10)}L, ${toHex(entry.usbHidCode, digits: 10)}L); // ${entry.constantName}');
}
}
return androidScanCodeMap.toString().trimRight();
Expand Down
14 changes: 4 additions & 10 deletions dev/tools/gen_keycodes/lib/keyboard_maps_code_gen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,8 @@ class KeyboardMapsCodeGenerator extends BaseCodeGenerator {
String get _androidScanCodeMap {
final OutputLines<int> lines = OutputLines<int>('Android scancode map');
for (final PhysicalKeyEntry entry in keyData.entries) {
if (entry.androidScanCodes != null) {
for (final int code in entry.androidScanCodes) {
lines.add(code, ' $code: PhysicalKeyboardKey.${entry.constantName},');
}
for (final int code in entry.androidScanCodes) {
lines.add(code, ' $code: PhysicalKeyboardKey.${entry.constantName},');
}
}
return lines.sortedJoin().trimRight();
Expand Down Expand Up @@ -296,9 +294,7 @@ class KeyboardMapsCodeGenerator extends BaseCodeGenerator {
String get _fuchsiaHidCodeMap {
final StringBuffer fuchsiaScanCodeMap = StringBuffer();
for (final PhysicalKeyEntry entry in keyData.entries) {
if (entry.usbHidCode != null) {
fuchsiaScanCodeMap.writeln(' ${toHex(entry.usbHidCode)}: PhysicalKeyboardKey.${entry.constantName},');
}
fuchsiaScanCodeMap.writeln(' ${toHex(entry.usbHidCode)}: PhysicalKeyboardKey.${entry.constantName},');
}
return fuchsiaScanCodeMap.toString().trimRight();
}
Expand Down Expand Up @@ -328,9 +324,7 @@ class KeyboardMapsCodeGenerator extends BaseCodeGenerator {
String get _webNumpadMap {
final OutputLines<String> lines = OutputLines<String>('Web numpad map');
for (final LogicalKeyEntry entry in _numpadLogicalKeyData) {
if (entry.name != null) {
lines.add(entry.name, " '${entry.name}': LogicalKeyboardKey.${entry.constantName},");
}
lines.add(entry.name, " '${entry.name}': LogicalKeyboardKey.${entry.constantName},");
}
return lines.sortedJoin().trimRight();
}
Expand Down
3 changes: 0 additions & 3 deletions dev/tools/gen_keycodes/lib/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@ String wrapString(String input, {required String prefix}) {
///
/// An null list is considered a list with length 0.
void zipStrict<T1, T2>(Iterable<T1> list1, Iterable<T2> list2, void Function(T1, T2) fn) {
if (list1 == null && list2 == null) {
return;
}
assert(list1.length == list2.length);
final Iterator<T1> it1 = list1.iterator;
final Iterator<T2> it2 = list2.iterator;
Expand Down
4 changes: 0 additions & 4 deletions dev/tools/localization/bin/gen_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,8 @@ String generateArbBasedLocalizationSubclasses({
required String supportedLanguagesConstant,
required String supportedLanguagesDocMacro,
}) {
assert(localeToResources != null);
assert(localeToResourceAttributes != null);
assert(generatedClassPrefix.isNotEmpty);
assert(baseClass.isNotEmpty);
assert(generateHeader != null);
assert(generateConstructor != null);
assert(factoryName.isNotEmpty);
assert(factoryDeclaration.isNotEmpty);
assert(factoryArguments.isNotEmpty);
Expand Down
7 changes: 1 addition & 6 deletions dev/tools/localization/localizations_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class LocaleInfo implements Comparable<LocaleInfo> {
scriptCode = codes[1].length > codes[2].length ? codes[1] : codes[2];
countryCode = codes[1].length < codes[2].length ? codes[1] : codes[2];
}
assert(codes[0] != null && codes[0].isNotEmpty);
assert(codes[0].isNotEmpty);
assert(countryCode == null || countryCode.isNotEmpty);
assert(scriptCode == null || scriptCode.isNotEmpty);

Expand Down Expand Up @@ -151,10 +151,6 @@ void loadMatchingArbsIntoBundleMaps({
required Map<LocaleInfo, Map<String, String>> localeToResources,
required Map<LocaleInfo, Map<String, dynamic>> localeToResourceAttributes,
}) {
assert(directory != null);
assert(filenamePattern != null);
assert(localeToResources != null);
assert(localeToResourceAttributes != null);

/// Set that holds the locales that were assumed from the existing locales.
///
Expand Down Expand Up @@ -214,7 +210,6 @@ void loadMatchingArbsIntoBundleMaps({
}

void exitWithError(String errorMessage) {
assert(errorMessage != null);
stderr.writeln('fatal: $errorMessage');
exit(1);
}
Expand Down
4 changes: 2 additions & 2 deletions dev/tools/vitool/test/vitool_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ class PathMatcher extends Matcher {

@override
bool matches(dynamic item, Map<dynamic, dynamic> matchState) {
if (item == null || actual == null) {
if (item == null) {
return item == actual;
}

Expand Down Expand Up @@ -666,7 +666,7 @@ class PathAnimationMatcher extends Matcher {

@override
bool matches(dynamic item, Map<dynamic, dynamic> matchState) {
if (item == null || expected == null) {
if (item == null) {
return item == expected;
}

Expand Down

0 comments on commit 99b5262

Please sign in to comment.