Undisclosed project number 1234
feat(render): social row types
Lewis: May this revision serve well! <lu5a@proton.me>
author
Lewis
date
(May 22, 2026, 11:25 PM +0300)
commit
b16114ba
b16114ba8d257af3233b9765f5539e0a40aa58c4
parent
770d1f6b
770d1f6b701eaf6c659a12a59cf5d8329bdd84d5
change-id
ptsmyzur
ptsmyzurulnvxwyrwpluzlzkvqzrzxuz
+186
-15
+1
Cargo.lock
+1
Cargo.lock
+1
Cargo.toml
+1
Cargo.toml
+1
crates/superjam-render/Cargo.toml
+1
crates/superjam-render/Cargo.toml
+9
-6
crates/superjam-render/src/lib.rs
+9
-6
crates/superjam-render/src/lib.rs
···
16
16
pub use text::StateBadge;
17
17
pub use tree::CommentNode;
18
18
pub use views::{
19
-
AuthIdentitiesView, AuthIdentityRow, AuthStatusView, FollowerCount, FollowingCount,
20
-
ISSUE_LIST_COLUMNS, IssueListRow, IssueViewCard, MessageView, PULL_LIST_COLUMNS, ProfileBody,
21
-
ProfileCardView, ProfileCounts, PullInterdiffView, PullListRow, PullPatchView, PullRoundEntry,
22
-
PullViewCard, REPO_LIST_COLUMNS, RemovedRecordView, RepoCardView, RepoCount, RepoListRow,
23
-
RepoUrlView, StarCount, WroteBatchItem, WroteBatchView, WroteRecordView, issue_list_row_cells,
24
-
pull_list_row_cells, repo_list_row_cells,
19
+
AuthIdentitiesView, AuthIdentityRow, AuthStatusView, FOLLOW_LIST_COLUMNS, FollowListRow,
20
+
FollowerCount, FollowingCount, ISSUE_LIST_COLUMNS, IssueListRow, IssueViewCard, MessageView,
21
+
PULL_LIST_COLUMNS, ProfileBody, ProfileCardView, ProfileCounts, PullInterdiffView, PullListRow,
22
+
PullPatchView, PullRoundEntry, PullViewCard, REACTION_LIST_COLUMNS, REPO_LIST_COLUMNS,
23
+
ReactionListRow, RemovedRecordView, RepoCardView, RepoCount, RepoListRow, RepoUrlView,
24
+
STAR_LIST_COLUMNS, STAR_ON_REPO_COLUMNS, StarCount, StarListRow, StarSubjectKind,
25
+
WroteBatchItem, WroteBatchView, WroteRecordView, follow_list_row_cells, issue_list_row_cells,
26
+
pull_list_row_cells, reaction_list_row_cells, repo_list_row_cells, star_list_row_cells,
27
+
star_on_repo_row_cells,
25
28
};
+34
-9
crates/superjam-render/src/table.rs
+34
-9
crates/superjam-render/src/table.rs
···
88
88
}
89
89
90
90
pub(crate) fn visible_width(s: &str) -> usize {
91
+
use unicode_width::UnicodeWidthChar;
91
92
s.chars()
92
-
.fold((false, 0usize), |(in_escape, count), c| {
93
-
match (in_escape, c) {
94
-
(false, '\u{1b}') => (true, count),
95
-
(true, c) if c.is_ascii_alphabetic() => (false, count),
96
-
(true, _) => (true, count),
97
-
(false, _) => (false, count + 1),
98
-
}
99
-
})
100
-
.1
93
+
.fold(
94
+
(false, false, 0usize),
95
+
|(in_escape, prev_zwj, count), c| match (in_escape, prev_zwj, c) {
96
+
(false, _, '\u{1b}') => (true, false, count),
97
+
(true, _, c) if c.is_ascii_alphabetic() => (false, false, count),
98
+
(true, _, _) => (true, false, count),
99
+
(false, _, '\u{FE0F}') => (false, false, count + 1),
100
+
(false, _, '\u{200D}') => (false, true, count),
101
+
(false, true, _) => (false, false, count),
102
+
(false, false, _) => (false, false, count + c.width().unwrap_or(0)),
103
+
},
104
+
)
105
+
.2
101
106
}
102
107
103
108
pub(crate) fn pad_cell(cell: &str, width: usize) -> String {
···
157
162
assert_eq!(visible_width(colored), 3);
158
163
let combined = "\x1b[1mA\x1b[0m \x1b[32mB\x1b[0m";
159
164
assert_eq!(visible_width(combined), 3);
165
+
}
166
+
167
+
#[test]
168
+
fn visible_width_counts_emoji_with_vs16() {
169
+
assert_eq!(visible_width("\u{2764}\u{FE0F}"), 2);
170
+
assert_eq!(visible_width("a\u{2764}\u{FE0F}b"), 4);
171
+
assert_eq!(visible_width("\u{1F980}"), 2);
172
+
}
173
+
174
+
#[test]
175
+
fn visible_width_collapses_zwj_sequences() {
176
+
assert_eq!(visible_width("\u{1F469}\u{200D}\u{1F680}"), 2);
177
+
assert_eq!(
178
+
visible_width("\u{1F468}\u{200D}\u{1F469}\u{200D}\u{1F467}\u{200D}\u{1F466}"),
179
+
2,
180
+
);
181
+
assert_eq!(
182
+
visible_width("\u{1F3F3}\u{FE0F}\u{200D}\u{1F308}"),
183
+
2,
184
+
);
160
185
}
161
186
162
187
#[test]
+6
crates/superjam-render/src/views/mod.rs
+6
crates/superjam-render/src/views/mod.rs
···
5
5
mod profile;
6
6
mod pull;
7
7
mod repo;
8
+
mod social;
8
9
9
10
pub use auth::{AuthIdentitiesView, AuthIdentityRow, AuthStatusView};
10
11
pub use issue::{ISSUE_LIST_COLUMNS, IssueListRow, IssueViewCard, issue_list_row_cells};
···
19
20
pull_list_row_cells,
20
21
};
21
22
pub use repo::{REPO_LIST_COLUMNS, RepoCardView, RepoListRow, RepoUrlView, repo_list_row_cells};
23
+
pub use social::{
24
+
FOLLOW_LIST_COLUMNS, FollowListRow, REACTION_LIST_COLUMNS, ReactionListRow,
25
+
STAR_LIST_COLUMNS, STAR_ON_REPO_COLUMNS, StarListRow, StarSubjectKind, follow_list_row_cells,
26
+
reaction_list_row_cells, star_list_row_cells, star_on_repo_row_cells,
27
+
};