Skip to content

Commit 3151c43

Browse files
eyebrowsoffireloic-sharma
authored andcommitted
Generate font fallback data to be const. (flutter#38259)
* Generate font fallback data to be const. * Fix end points.
1 parent 264bf1a commit 3151c43

File tree

2 files changed

+158
-152
lines changed

2 files changed

+158
-152
lines changed

lib/web_ui/dev/generate_fallback_font_data.dart

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,28 @@ class GenerateFallbackFontDataCommand extends Command<bool>
111111
sb.writeln('// dev/generate_fallback_font_data.dart');
112112
sb.writeln("import 'noto_font.dart';");
113113
sb.writeln();
114-
sb.writeln('final List<NotoFont> fallbackFonts = <NotoFont>[');
114+
sb.writeln('const List<NotoFont> fallbackFonts = <NotoFont>[');
115115
for (final String family in fallbackFonts) {
116-
sb.write(" NotoFont.fromFlatRanges('$family', '${urlForFamily[family]!}', "
117-
'<int>[');
116+
sb.write(" NotoFont('$family', '${urlForFamily[family]!}', ");
117+
final List<String> starts = <String>[];
118+
final List<String> ends = <String>[];
118119
for (final String range in charsetForFamily[family]!.split(' ')) {
119-
String? start;
120-
String? end;
121120
final List<String> parts = range.split('-');
122121
if (parts.length == 1) {
123-
start = parts[0];
124-
end = parts[0];
122+
starts.add(parts[0]);
123+
ends.add(parts[0]);
125124
} else {
126-
start = parts[0];
127-
end = parts[1];
125+
starts.add(parts[0]);
126+
ends.add(parts[1]);
128127
}
129-
sb.write('0x$start,0x$end,');
128+
}
129+
sb.write('<int>[');
130+
for (final String start in starts) {
131+
sb.write('0x$start,');
132+
}
133+
sb.write('], <int>[');
134+
for (final String end in ends) {
135+
sb.write('0x$end,');
130136
}
131137
sb.writeln(']),');
132138
}

0 commit comments

Comments
 (0)