Skip to content

Commit b16eec7

Browse files
browclaude
andcommitted
mobile: require preview delimiters to close in order
Matching counts let a stray closer before a real opener pass, so a preview could cut while an underline, link or formula was still open. Each pair is now checked in order, in one pass. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: Tom Brow <[email protected]>
1 parent 773d427 commit b16eec7

2 files changed

Lines changed: 34 additions & 4 deletions

File tree

‎mobile/lib/features/channels/message_content/preview_source.dart‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,31 @@ String? _withoutCode(List<String> prose) {
7979

8080
bool _closesInline(String text) {
8181
bool even(Pattern pattern) => pattern.allMatches(text).length.isEven;
82-
int count(String token) => token.allMatches(text).length;
8382
return even('**') &&
8483
even(RegExp(r'(?<!\*)\*(?!\*)')) &&
8584
even('~~') &&
8685
even(RegExp(r'(?<!`)`(?!`)')) &&
87-
count('[') == count(']') &&
88-
count(r'\(') == count(r'\)') &&
89-
count('<u>') == count('</u>') &&
86+
_nests(text, '[', ']') &&
87+
_nests(text, r'\(', r'\)') &&
88+
_nests(text, '<u>', '</u>') &&
9089
!text.contains('【');
9190
}
91+
92+
/// Whether every [open] in [text] is closed by a later [close] and no
93+
/// [close] comes before its [open]. Each token is searched for once per
94+
/// match, so this is linear in [text].
95+
bool _nests(String text, String open, String close) {
96+
var depth = 0;
97+
var nextOpen = text.indexOf(open);
98+
var nextClose = text.indexOf(close);
99+
while (nextOpen >= 0 || nextClose >= 0) {
100+
if (nextClose < 0 || (nextOpen >= 0 && nextOpen < nextClose)) {
101+
depth++;
102+
nextOpen = text.indexOf(open, nextOpen + open.length);
103+
} else {
104+
if (--depth < 0) return false;
105+
nextClose = text.indexOf(close, nextClose + close.length);
106+
}
107+
}
108+
return depth == 0;
109+
}

‎mobile/test/features/channels/message_content/preview_source_test.dart‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,18 @@ void main() {
146146
maxLines: 1,
147147
cut: false,
148148
),
149+
(
150+
name: 'stray closer before an opener',
151+
source: [
152+
'</u> stray',
153+
'<u>opened',
154+
'still open',
155+
'more',
156+
'closed</u>',
157+
].join('\n'),
158+
maxLines: 2,
159+
cut: false,
160+
),
149161
(
150162
name: 'unclosed fence',
151163
source: ['```', for (var i = 0; i < 10; i++) 'line $i'].join('\n'),

0 commit comments

Comments
 (0)