Skip to content

Commit c18ea48

Browse files
committed
content [nfc]: Move parseMessageContent here, from msglist; make public
1 parent e96cad7 commit c18ea48

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/model/content.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,3 +1927,9 @@ class _ZulipContentParser {
19271927
ZulipContent parseContent(String html) {
19281928
return _ZulipContentParser().parse(html);
19291929
}
1930+
1931+
ZulipMessageContent parseMessageContent(Message message) {
1932+
final poll = message.poll;
1933+
if (poll != null) return PollContent(poll);
1934+
return parseContent(message.content);
1935+
}

lib/model/message_list.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,10 @@ mixin _MessageSequence {
257257
}
258258
}
259259

260-
ZulipMessageContent _parseMessageContent(Message message) {
261-
final poll = message.poll;
262-
if (poll != null) return PollContent(poll);
263-
return parseContent(message.content);
264-
}
265-
266260
/// Update data derived from the content of the index-th message.
267261
void _reparseContent(int index) {
268262
final message = messages[index];
269-
final content = _parseMessageContent(message);
263+
final content = parseMessageContent(message);
270264
contents[index] = content;
271265

272266
final itemIndex = findItemWithMessageId(message.id);
@@ -283,7 +277,7 @@ mixin _MessageSequence {
283277
void _addMessage(Message message) {
284278
assert(contents.length == messages.length);
285279
messages.add(message);
286-
contents.add(_parseMessageContent(message));
280+
contents.add(parseMessageContent(message));
287281
assert(contents.length == messages.length);
288282
_processMessage(messages.length - 1);
289283
}
@@ -362,7 +356,7 @@ mixin _MessageSequence {
362356
assert(contents.length == messages.length);
363357
messages.insertAll(index, toInsert);
364358
contents.insertAll(index, toInsert.map(
365-
(message) => _parseMessageContent(message)));
359+
(message) => parseMessageContent(message)));
366360
assert(contents.length == messages.length);
367361
if (index <= middleMessage) {
368362
middleMessage += messages.length - oldLength;
@@ -425,7 +419,7 @@ mixin _MessageSequence {
425419
void _recompute() {
426420
assert(contents.length == messages.length);
427421
contents.clear();
428-
contents.addAll(messages.map((message) => _parseMessageContent(message)));
422+
contents.addAll(messages.map((message) => parseMessageContent(message)));
429423
assert(contents.length == messages.length);
430424
_reprocessAll();
431425
}

0 commit comments

Comments
 (0)