Skip to content

fix inline code regex - #1337

Merged
styfle merged 2 commits into
markedjs:masterfrom
UziTech:code-trimmed
Sep 20, 2018
Merged

fix inline code regex#1337
styfle merged 2 commits into
markedjs:masterfrom
UziTech:code-trimmed

Conversation

@UziTech

@UziTechUziTech commented Sep 16, 2018

Copy link
Copy Markdown
Member

Marked version: 0.5.0

Description

  • Fix inline code trimming

fixes#1218

Contributor

  • Test(s) exist to ensure functionality and minimize regression

Committer

In most cases, this should be a different person than the contributor.

  • Draft GitHub release notes have been updated.
  • CI is green (no forced merge required).
  • Merge PR

@styfle

Copy link
Copy Markdown
Member

Which issue is this fixing?
Or is this just something you noticed recently?

@UziTech

Copy link
Copy Markdown
MemberAuthor

The slack issue

@styflestyfle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@davisjam

davisjam commented Sep 16, 2018

Copy link
Copy Markdown
Contributor

I'm not confident that this change will address the Slack issue. I will ponder it tomorrow.

@UziTech

Copy link
Copy Markdown
MemberAuthor

When I tested this change the POC went from 9s to a few ms

@davisjam

Copy link
Copy Markdown
Contributor

@UziTech Acknowledged. I am thinking about whether variations will still lead to the problem.

@UziTech

Copy link
Copy Markdown
MemberAuthor

I updated the regex to pass more of the code span spec. @davisjam check if the new regex is safe.

@UziTech

Copy link
Copy Markdown
MemberAuthor

I rebased and fixed the merge conflicts after #1338

@davisjam

Copy link
Copy Markdown
Contributor

I have reviewed the regexes. LGTM.

@styfle
styfle merged commit b891696 into markedjs:masterSep 20, 2018
@joshbruce

Copy link
Copy Markdown
Member

Releasing

@UziTech

Copy link
Copy Markdown
MemberAuthor

@joshbruce I really think we should merge #1331 before a new release

@joshbruce

Copy link
Copy Markdown
Member

Oh. I thought it was already merged. Still good to go, yeah? (From 17 days ago, my bad.)

@UziTech

Copy link
Copy Markdown
MemberAuthor

Yup should be good to go

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Code blocks with email-like text are no longer parsed as code

4 participants

@UziTech@styfle@davisjam@joshbruce