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.

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

Jump to bottom

fix: em and strong starting with special char #1832

Merged
merged 1 commit into from Nov 19, 2020
Merged

fix: em and strong starting with special char #1832

merged 1 commit into from Nov 19, 2020

Conversation

UziTech
Copy link
Member

@UziTech UziTech commented Nov 17, 2020

Marked version: 1.2.4

Description

Fix em that starts with a special character after another inline element

example:

Line 1\
*@person*

demo

fixes #1831

Contributor

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

Committer

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

@vercel
Copy link

vercel bot commented Nov 17, 2020 •
edited

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/markedjs/markedjs/1wia8crwy
✅ Preview: https://markedjs-git-emafterinline.markedjs.vercel.app

UziTech
UziTech commented Nov 17, 2020
View reviewed changes
src/Lexer.js Show resolved Hide resolved
calculuschild
calculuschild reviewed Nov 17, 2020
View reviewed changes
src/Lexer.js Outdated Show resolved Hide resolved
@UziTech UziTech merged commit f9bc93b into markedjs:master Nov 19, 2020
github-actions bot pushed a commit that referenced this pull request Nov 19, 2020
@semantic-release-bot
chore(release): 1.2.5 [skip ci]
4ec889b 
## [1.2.5](v1.2.4...v1.2.5) (2020-11-19)

### Bug Fixes

* fix em and strong starting with special char ([#1832](#1832)) ([f9bc93b](f9bc93b))
* task lists not rendered when GFM is disabled ([#1825](#1825)) ([3942e89](3942e89)), closes [#1823](#1823)
@github-actions
Copy link

🎉 This PR is included in version 1.2.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

@UziTech UziTech deleted the em_after_inline branch November 20, 2020 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@styfle styfle styfle approved these changes

@calculuschild calculuschild calculuschild approved these changes

@davisjam davisjam Awaiting requested review from davisjam

@joshbruce joshbruce Awaiting requested review from joshbruce

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bold "@" in block quote doesn't render correctly
3 participants
@UziTech @styfle @calculuschild