[flutter_tools] refactor license collector (#128748)

christopherfujino · web-flow · commit 735fc2962209 · 2023-06-15T20:25:19.000Z
Improve debugging for flutter/flutter#128680 In the linked issue, I cannot explain how we are getting a type error. However, this refactor eliminates the null check operator (by iterating over `MapEntries` rather than the keys) in hopes that there will be a more descriptive error in the future. The correctness of this change is verified by the existing tests in https://github.com/flutter/flutter/blob/master/packages/flutter_tools/test/general.shard/license_collector_test.dart
diff --git a/packages/flutter_tools/lib/src/license_collector.dart b/packages/flutter_tools/lib/src/license_collector.dart
@@ -82,11 +82,10 @@ class LicenseCollector {
       }
     }
 
-    final List<String> combinedLicensesList = packageLicenses.keys
-      .map<String>((String license) {
-        final List<String> packageNames = packageLicenses[license]!.toList()
-          ..sort();
-        return '${packageNames.join('\n')}\n\n$license';
+    final List<String> combinedLicensesList = packageLicenses.entries
+      .map<String>((MapEntry<String, Set<String>> entry) {
+        final List<String> packageNames = entry.value.toList()..sort();
+        return '${packageNames.join('\n')}\n\n${entry.key}';
       }).toList();
     combinedLicensesList.sort();
 

Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,10 @@ class LicenseCollector {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- final List<String> combinedLicensesList = packageLicenses.keys`
`86`		`- .map<String>((String license) {`
`87`		`- final List<String> packageNames = packageLicenses[license]!.toList()`
`88`		`- ..sort();`
`89`		`- return '${packageNames.join('\n')}\n\n$license';`
	`85`	`+ final List<String> combinedLicensesList = packageLicenses.entries`
	`86`	`+ .map<String>((MapEntry<String, Set<String>> entry) {`
	`87`	`+ final List<String> packageNames = entry.value.toList()..sort();`
	`88`	`+ return '${packageNames.join('\n')}\n\n${entry.key}';`
`90`	`89`	`}).toList();`
`91`	`90`	`combinedLicensesList.sort();`
`92`	`91`