Phosphor icons: resolve by name via a generated map (T-314)
Replace the 49 hand-maintained named consts with one generated
label→codepoint map (phosphor_glyphs.g.dart, 1512 glyphs from the glyph
table via tool/gen_phosphor_glyphs.dart). Feature code now references
glyphs by their exact kebab-case name — PhosphorIcons.byName('folder') —
with no raw codepoints; this also lets a Lua extension name an icon
without crossing the FFI boundary with a codepoint.
byName is total: an unknown name degrades to the `placeholder` box so the
bug is visible (it's a real error), while phosphor_glyphs_test asserts
every byName('...') literal in lib/ resolves — recovering the typo check a
const gave. Migrated the 89 call sites. Adds EmptyIconPainter for an
intentional blank that still reserves the icon box; ClideFilterBox gains
showIcon to keep the slot aligned when blank.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -38,17 +38,17 @@ void main() {
|
||||
// Sidebar open → action is collapse (leftward) → caret-line-left.
|
||||
await tester.pumpWidget(_host(f, const StatusbarCollapseToggle(slot: Slots.sidebar, collapsed: false, visible: true)));
|
||||
await tester.pump();
|
||||
expect(_icon(PhosphorIcons.caretLineLeft), findsOneWidget);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-left')), findsOneWidget);
|
||||
|
||||
// Sidebar collapsed → action is expand (rightward) → caret-line-right.
|
||||
await tester.pumpWidget(_host(f, const StatusbarCollapseToggle(slot: Slots.sidebar, collapsed: true, visible: true)));
|
||||
await tester.pump();
|
||||
expect(_icon(PhosphorIcons.caretLineRight), findsOneWidget);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-right')), findsOneWidget);
|
||||
|
||||
// The context toggle mirrors it: open → collapse rightward, collapsed → expand leftward.
|
||||
await tester.pumpWidget(_host(f, const StatusbarCollapseToggle(slot: Slots.contextPanel, collapsed: false, visible: true)));
|
||||
await tester.pump();
|
||||
expect(_icon(PhosphorIcons.caretLineRight), findsOneWidget);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-right')), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('the chevron flips live when the collapsed state changes', (tester) async {
|
||||
@@ -62,19 +62,19 @@ void main() {
|
||||
}),
|
||||
));
|
||||
await tester.pump();
|
||||
expect(_icon(PhosphorIcons.caretLineLeft), findsOneWidget);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-left')), findsOneWidget);
|
||||
|
||||
setOuter(() => collapsed = true);
|
||||
await tester.pump();
|
||||
expect(_icon(PhosphorIcons.caretLineRight), findsOneWidget, reason: 'rebuilds and flips on state change');
|
||||
expect(_icon(PhosphorIcons.caretLineLeft), findsNothing);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-right')), findsOneWidget, reason: 'rebuilds and flips on state change');
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-left')), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('a hidden pane reserves the cell but shows no chevron', (tester) async {
|
||||
await tester.pumpWidget(_host(f, const StatusbarCollapseToggle(slot: Slots.sidebar, collapsed: false, visible: false)));
|
||||
await tester.pump();
|
||||
expect(_icon(PhosphorIcons.caretLineLeft), findsNothing);
|
||||
expect(_icon(PhosphorIcons.caretLineRight), findsNothing);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-left')), findsNothing);
|
||||
expect(_icon(PhosphorIcons.byName('caret-line-right')), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('tapping fires the matching collapse command', (tester) async {
|
||||
@@ -90,7 +90,7 @@ void main() {
|
||||
await tester.pump();
|
||||
expect(f.services.arrangement.isCollapsed(Slots.sidebar), isFalse);
|
||||
|
||||
await tester.tap(_icon(PhosphorIcons.caretLineLeft));
|
||||
await tester.tap(_icon(PhosphorIcons.byName('caret-line-left')));
|
||||
await tester.pump();
|
||||
|
||||
expect(f.services.arrangement.isCollapsed(Slots.sidebar), isTrue);
|
||||
|
||||
@@ -368,7 +368,7 @@ void main() {
|
||||
expect(find.text('Interrupt'), findsOneWidget);
|
||||
// The tickbox is implemented as a Container that is empty when unchecked
|
||||
// and shows a check icon when checked. Verify by checking that the check
|
||||
// icon (PhosphorIcons.check) is NOT rendered when unchecked.
|
||||
// icon (PhosphorIcons.byName('check')) is NOT rendered when unchecked.
|
||||
// We use the Semantics widget's checked property which maps to isChecked.
|
||||
final interruptFinder = find.byWidgetPredicate((w) => w is Semantics && w.properties.label == 'Interrupt target session');
|
||||
// Widget exists in tree.
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
/// Guards the Phosphor label→codepoint indirection (T-314). The named consts
|
||||
/// are gone; code resolves glyphs by string via [PhosphorIcons.byName]. A
|
||||
/// string key loses the compiler's typo check, so this test recovers it: every
|
||||
/// `byName('…')` string literal in `lib/` must exist in the generated map —
|
||||
/// across all call sites, executed or not.
|
||||
library;
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/widgets/src/icons/phosphor_glyphs.g.dart';
|
||||
import 'package:clide/widgets/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
void main() {
|
||||
test('the generated glyph map covers the full Phosphor set', () {
|
||||
expect(kPhosphorGlyphs.length, greaterThanOrEqualTo(1500));
|
||||
expect(kPhosphorGlyphs.containsKey('folder'), isTrue);
|
||||
// The fallback glyph must itself resolve, or byName would throw on a miss.
|
||||
expect(kPhosphorGlyphs.containsKey(PhosphorIcons.fallbackName), isTrue);
|
||||
});
|
||||
|
||||
test('every byName(\'…\') literal in lib/ resolves to a real glyph', () {
|
||||
final call = RegExp(r"byName\(\s*'([a-z0-9-]+)'\s*\)");
|
||||
final missing = <String, String>{}; // label -> first file it appears in
|
||||
for (final entity in Directory('lib').listSync(recursive: true)) {
|
||||
if (entity is! File || !entity.path.endsWith('.dart')) continue;
|
||||
for (final m in call.allMatches(entity.readAsStringSync())) {
|
||||
final label = m.group(1)!;
|
||||
if (!kPhosphorGlyphs.containsKey(label)) {
|
||||
missing.putIfAbsent(label, () => entity.path);
|
||||
}
|
||||
}
|
||||
}
|
||||
expect(missing, isEmpty, reason: 'unknown Phosphor glyph name(s) in byName(): $missing');
|
||||
});
|
||||
|
||||
test('byName resolves a known name to its codepoint', () {
|
||||
expect(PhosphorIcons.byName('folder').codePoint, kPhosphorGlyphs['folder']);
|
||||
expect(PhosphorIcons.byName('caret-line-left').codePoint, kPhosphorGlyphs['caret-line-left']);
|
||||
});
|
||||
|
||||
test('byName degrades an unknown name to the placeholder fallback (never throws)', () {
|
||||
final fallback = kPhosphorGlyphs[PhosphorIcons.fallbackName];
|
||||
expect(PhosphorIcons.byName('definitely-not-a-real-glyph').codePoint, fallback);
|
||||
expect(PhosphorIcons.fallbackName, 'placeholder');
|
||||
});
|
||||
}
|
||||
@@ -296,11 +296,13 @@ void main() {
|
||||
testWidgets('renders the hint as a placeholder (shown empty, hidden once typed); icon optional', (tester) async {
|
||||
await tester.pumpWidget(harness(
|
||||
f,
|
||||
ClideFilterBox(onChanged: (_) {}, hint: 'Replace', icon: null),
|
||||
ClideFilterBox(onChanged: (_) {}, hint: 'Replace', showIcon: false),
|
||||
));
|
||||
// Placeholder visible while empty; no leading search glyph (icon: null).
|
||||
// Placeholder visible while empty; the icon slot is kept for alignment but
|
||||
// draws a blank glyph (showIcon: false → EmptyIconPainter).
|
||||
expect(find.text('Replace'), findsOneWidget);
|
||||
expect(find.byType(ClideIcon), findsNothing);
|
||||
expect(find.byType(ClideIcon), findsOneWidget);
|
||||
expect(tester.widget<ClideIcon>(find.byType(ClideIcon)).painter, isA<EmptyIconPainter>());
|
||||
// Typing hides the placeholder.
|
||||
await tester.enterText(find.byType(EditableText), 'x');
|
||||
await tester.pump();
|
||||
@@ -349,9 +351,9 @@ void main() {
|
||||
await tester.pumpWidget(harness(
|
||||
f,
|
||||
ClideIconRail(
|
||||
items: const [
|
||||
ClideIconRailItem(id: 'a', icon: PhosphorIcons.folder, tooltip: 'A'),
|
||||
ClideIconRailItem(id: 'b', icon: PhosphorIcons.gitBranch, tooltip: 'B'),
|
||||
items: [
|
||||
ClideIconRailItem(id: 'a', icon: PhosphorIcons.byName('folder'), tooltip: 'A'),
|
||||
ClideIconRailItem(id: 'b', icon: PhosphorIcons.byName('git-branch'), tooltip: 'B'),
|
||||
],
|
||||
activeId: 'a',
|
||||
onSelect: (id) => selected = id,
|
||||
@@ -373,7 +375,7 @@ void main() {
|
||||
height: 30,
|
||||
child: ClideIconRail(
|
||||
items: [
|
||||
for (var i = 0; i < 10; i++) ClideIconRailItem(id: '$i', icon: PhosphorIcons.folder, tooltip: 'Tab $i'),
|
||||
for (var i = 0; i < 10; i++) ClideIconRailItem(id: '$i', icon: PhosphorIcons.byName('folder'), tooltip: 'Tab $i'),
|
||||
],
|
||||
activeId: '0',
|
||||
onSelect: (_) {},
|
||||
|
||||
Reference in New Issue
Block a user