Skip to content

Fix nested links produced when a bracket opens after an inner link #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zayeem06 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix nested links produced when a bracket opens after an inner link #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/inlines.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ typedef struct {
bracket *last_bracket;
bufsize_t backticks[MAXBACKTICKS + 1];
bool scanned_for_backticks;
bool no_link_openers;
} subject;

static inline bool S_is_line_end_char(char c) {
Expand Down Expand Up @@ -209,7 +208,6 @@ static void subject_from_buf(cmark_mem *mem, int line_number, int block_offset,
e->backticks[i] = 0;
}
e->scanned_for_backticks = false;
e->no_link_openers = true;
}

static inline int isbacktick(int c) { return (c == '`'); }
Expand Down Expand Up @@ -557,9 +555,6 @@ static void push_bracket(subject *subj, bool image, cmark_node *inl_text) {
b->position = subj->pos;
b->bracket_after = false;
subj->last_bracket = b;
if (!image) {
subj->no_link_openers = false;
}
}

// Assumes the subject has a c at the current position.
Expand Down Expand Up @@ -1158,7 +1153,7 @@ static cmark_node *handle_close_bracket(subject *subj) {
// Now we check to see if it's a link/image.
is_image = opener->image;

if (!is_image && subj->no_link_openers) {
if (!is_image && !opener->active) {
// take delimiter off stack
pop_bracket(subj);
return make_str(subj, subj->pos - 1, subj->pos - 1, cmark_chunk_literal("]"));
Expand Down Expand Up @@ -1259,11 +1254,18 @@ static cmark_node *handle_close_bracket(subject *subj) {
process_emphasis(subj, opener->position);
pop_bracket(subj);

// Now, if we have a link, we also want to deactivate links until
// we get a new opener. (This code can be removed if we decide to allow links
// inside links.)
// Links may not contain other links, at any level of nesting, so
// deactivate every remaining link opener. This prevents an enclosing
// [ from being turned into a link that wraps the one just created.
// (This loop can be removed if we decide to allow links inside links.)
if (!is_image) {
subj->no_link_openers = true;
bracket *b = subj->last_bracket;
while (b != NULL) {
if (!b->image) {
b->active = false;
}
b = b->previous;
}
}

return NULL;
Expand Down
17 changes: 17 additions & 0 deletions test/regression.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,20 @@ c>)
<p>[a](&lt;b<br />
c&gt;)</p>
````````````````````````````````

Links may not contain other links at any level of nesting, even when a
bracket is opened between the inner link and the enclosing `]`.
```````````````````````````````` example
[foo [bar](/uri)[x]](/uri)
.
<p>[foo <a href="/uri">bar</a>[x]](/uri)</p>
````````````````````````````````

The same holds for a reference link enclosing an inline link.
```````````````````````````````` example
[ref]: /url

[a[b](c)d[e]f][ref]
.
<p>[a<a href="c">b</a>d[e]f]<a href="/url">ref</a></p>
````````````````````````````````
Expand Down
Loading