Skip to content
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.

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

fix inline code regex #1337

Merged
merged 2 commits into from
Sep 20, 2018
Merged

fix inline code regex #1337

merged 2 commits into from
Sep 20, 2018

Conversation

UziTech
Copy link
Member

@UziTech UziTech commented Sep 16, 2018

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
Member

styfle commented Sep 16, 2018

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

@UziTech
Copy link
Member Author

UziTech commented Sep 16, 2018

The slack issue

@styfle styfle requested a review from davisjam September 16, 2018 20:40
Copy link
Member

@styfle styfle left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@davisjam
Copy link
Contributor

davisjam commented Sep 16, 2018

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

@UziTech
Copy link
Member Author

UziTech commented Sep 16, 2018

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

@davisjam
Copy link
Contributor

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

@UziTech
Copy link
Member Author

UziTech commented Sep 17, 2018

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

@UziTech
Copy link
Member Author

UziTech commented Sep 18, 2018

I rebased and fixed the merge conflicts after #1338

@davisjam
Copy link
Contributor

I have reviewed the regexes. LGTM.

@styfle styfle merged commit b891696 into markedjs:master Sep 20, 2018
@joshbruce
Copy link
Member

Releasing

@UziTech
Copy link
Member Author

UziTech commented Sep 23, 2018

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

@joshbruce
Copy link
Member

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

@UziTech
Copy link
Member Author

UziTech commented Sep 23, 2018

Yup should be good to go

Sign up for free to 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