@@ -1,5 +1,6 @@
11 const std = @import("std");
22 const styles = @import("styles.zig");
3+const format = @import("format.zig");
34
45 const Span = struct {
56 start: u32,
@@ -82,18 +83,49 @@ fn runLength(line: []const u8, at: usize, c: u8) usize {
8283 return n;
8384 }
8485
85-/// Closing run for `marker` repeated `count` times, ignoring empty or space-padded content.
86+/// Just past the code span opened at `i`, or null when its backticks never close.
87+fn codeSpanEnd(line: []const u8, at: usize, limit: usize) ?usize {
88+ // Backslashes are literal inside a code span, so only the run length closes it.
89+ const n = runLength(line, at, '`');
90+ var i = at + n;
91+ while (i < limit) : (i += 1) {
92+ if (line[i] == '`' and runLength(line, i, '`') >= n) return i + n;
93+ }
94+ return null;
95+}
96+
97+/// Closing run for `marker` repeated `count` times, ignoring empty or space-padded content
98+/// and anything escaped or inside a code span.
8699 fn closeRun(line: []const u8, open_at: usize, marker: u8, count: usize, limit: usize) ?usize {
87100 var i = open_at + count;
88101 while (i + count <= limit) : (i += 1) {
102+ if (line[i] == '\\') {
103+ i += 1;
104+ continue;
105+ }
106+ if (line[i] == '`') {
107+ i = (codeSpanEnd(line, i, limit) orelse i + runLength(line, i, '`')) - 1;
108+ continue;
109+ }
89110 if (line[i] != marker) continue;
90111 if (line[i - 1] == ' ' or line[i - 1] == '\t') continue;
91- if (runLength(line, i, marker) < count) continue;
112+ const run = runLength(line, i, marker);
113+ if (run < count) continue;
114+ // `_` only closes where a word ends, so `foo_bar_baz` stays literal.
115+ if (marker == '_' and i + run < limit and isAlnum(line[i + run])) continue;
92116 return i;
93117 }
94118 return null;
95119 }
96120
121+fn emphasis(count: usize) styles.Style {
122+ return switch (count) {
123+ 1 => .{ .italic = true },
124+ 2 => .{ .bold = true },
125+ else => .{ .bold = true, .italic = true },
126+ };
127+}
128+
97129 fn addSpan(a: std.mem.Allocator, spans: *std.ArrayList(Span), base: u32, start: usize, end: usize, style: styles.Style) void {
98130 if (end <= start) return;
99131 spans.append(a, .{ .start = base + @as(u32, @intCast(start)), .end = base + @as(u32, @intCast(end)), .style = style }) catch {};
@@ -104,23 +136,23 @@ fn scanInline(a: std.mem.Allocator, line: []const u8, base: u32, start: usize, l
104136 var i = start;
105137 while (i < limit) {
106138 const c = line[i];
139+ if (c == '\\' and i + 1 < limit) {
140+ i += 2;
141+ continue;
142+ }
107143 if (c == '`') {
108144 const n = runLength(line, i, '`');
109- var j = i + n;
110- while (j + n <= limit) : (j += 1) {
111- if (line[j] != '`') continue;
112- if (runLength(line, j, '`') < n) continue;
113- addSpan(a, spans, base, i, j + n, styles.roles.inline_code);
114- i = j + n;
115- break;
116- } else {
145+ const end = codeSpanEnd(line, i, limit) orelse {
117146 i += n;
118- }
147+ continue;
148+ };
149+ addSpan(a, spans, base, i, end, styles.roles.inline_code);
150+ i = end;
119151 continue;
120152 }
121153 if (c == '*' or c == '_') {
122154 const n = runLength(line, i, c);
123- const count: usize = @min(n, 2);
155+ const count: usize = @min(n, 3);
124156 const content = i + count;
125157 // An opener needs content and, for `_`, must not sit inside a word.
126158 if (content >= limit or line[content] == ' ' or line[content] == '\t' or
@@ -130,8 +162,8 @@ fn scanInline(a: std.mem.Allocator, line: []const u8, base: u32, start: usize, l
130162 continue;
131163 }
132164 if (closeRun(line, i, c, count, limit)) |close| {
133- const style: styles.Style = if (count == 2) .{ .bold = true } else .{ .italic = true };
134- addSpan(a, spans, base, i, close + count, style);
165+ addSpan(a, spans, base, i, close + count, emphasis(count));
166+ scanInline(a, line, base, content, close, spans);
135167 i = close + count;
136168 } else {
137169 i += n;
@@ -139,9 +171,9 @@ fn scanInline(a: std.mem.Allocator, line: []const u8, base: u32, start: usize, l
139171 continue;
140172 }
141173 if (c == '[') {
142- if (std.mem.indexOfScalarPos(u8, line[0..limit], i, ']')) |close| {
174+ if (format.closeBracket(line[0..limit], i)) |close| {
143175 if (close + 1 < limit and line[close + 1] == '(') {
144- if (std.mem.indexOfScalarPos(u8, line[0..limit], close + 1, ')')) |end| {
176+ if (format.linkEnd(line[0..limit], close + 1)) |end| {
145177 addSpan(a, spans, base, i, close + 1, styles.roles.link);
146178 addSpan(a, spans, base, close + 1, end + 1, styles.roles.uri);
147179 i = end + 1;
@@ -202,7 +234,7 @@ fn blockMarker(line: []const u8) ?usize {
202234 if (at >= line.len) return null;
203235 const c = line[at];
204236 if (c == '>' or c == '-' or c == '*' or c == '+') {
205- if (at + 1 < line.len and (line[at + 1] == ' ' or line[at + 1] == '\t')) return at + 1;
237+ if (at + 1 >= line.len or line[at + 1] == ' ' or line[at + 1] == '\t') return at + 1;
206238 return null;
207239 }
208240 var n = at;
@@ -218,15 +250,21 @@ fn markdownLine(a: std.mem.Allocator, line: []const u8, base: u32, spans: *std.A
218250 addSpan(a, spans, base, 0, limit, muted());
219251 return;
220252 }
221- if (headingLevel(line)) |level| {
253+ var start: usize = 0;
254+ while (blockMarker(line[start..])) |after| {
255+ addSpan(a, spans, base, start, start + after, muted());
256+ start += after;
257+ }
258+ // Headings and rules keep their style when quoted or listed.
259+ const rest = line[start..];
260+ if (headingLevel(rest)) |level| {
222261 const idx = @min(level, styles.roles.headings.len) - 1;
223- addSpan(a, spans, base, 0, limit, styles.roles.headings[idx]);
262+ addSpan(a, spans, base, start, limit, styles.roles.headings[idx]);
224263 return;
225264 }
226- var start: usize = 0;
227- if (blockMarker(line)) |after| {
228- addSpan(a, spans, base, 0, after, muted());
229- start = after;
265+ if (isFenceMarker(rest) or isRule(rest)) {
266+ addSpan(a, spans, base, start, limit, muted());
267+ return;
230268 }
231269 scanInline(a, line, base, start, limit, spans);
232270 }