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($shared-utils): improve title inference and header extraction for markdown links syntax #2688

Merged
merged 6 commits into from
Dec 19, 2020
Merged

fix($shared-utils): improve title inference and header extraction for markdown links syntax #2688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47a77a9
Merge pull request #1 from vuejs/master
nuochong Oct 29, 2020
e664cbc
fix: title inference / header extraction logic (#238)
nuochong Oct 29, 2020
97ce8d7
Merge branch 'dev' of github.com:nuochong/vuepress into dev
nuochong Oct 31, 2020
4f76ba5
Merge pull request #2 from nuochong/dev
nuochong Oct 31, 2020
c3f081e
fix: update test cases (#238)
nuochong Nov 17, 2020
06da4df
Merge pull request #3 from nuochong/dev
nuochong Nov 17, 2020
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
4 changes: 4 additions & 0 deletions packages/@vuepress/shared-utils/__tests__/parseHeaders.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ describe('parseHeaders', () => {
'\\*vue\\*': '*vue*',
'\\!vue\\!': '!vue!',

// #2688
'[vue](vuejs.org) / [vue](vuejs.org)': 'vue / vue',
'[\\<ins>](vuejs.org)': '<ins>',

// #564 For multiple markdown tokens
'`a` and `b`': 'a and b',
'***bold and italic***': 'bold and italic',
Expand Down
5 changes: 4 additions & 1 deletion packages/@vuepress/shared-utils/__tests__/removeNonCodeWrappedHTML.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ test('removeNonCodeWrappedHTML', () => {
'# H1 `<Comp></Comp>` H2': '# H1 `<Comp></Comp>` H2',
'# H1 `<Comp a="b"></Comp>` H2': '# H1 `<Comp a="b"></Comp>` H2',
'# H1 `<Comp/>` H2': '# H1 `<Comp/>` H2',
'# H1 `<Comp a="b"/>` H2': '# H1 `<Comp a="b"/>` H2'
'# H1 `<Comp a="b"/>` H2': '# H1 `<Comp a="b"/>` H2',

// #2688
'# \\<ins>': '# \\<ins>'
}

Object.keys(asserts).forEach(input => {
Expand Down
6 changes: 3 additions & 3 deletions packages/@vuepress/shared-utils/src/parseHeaders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import parseEmojis from './parseEmojis'
// wrapped by <code>(markdown token: '`') tag.

const removeMarkdownTokens = (str: string): string => String(str)
.replace(/\[(.*)\]\(.*\)/, '$1') // []()
.replace(/(`|\*{1,3}|_)(.*?[^\\])\1/g, '$2') // `{t}` | *{t}* | **{t}** | ***{t}*** | _{t}_
.replace(/(\\)(\*|_|`|\!)/g, '$2') // remove escape char '\'
.replace(/(\[(.[^\]]+)\]\((.[^)]+)\))/g, '$2') // []()
.replace(/(`|\*{1,3}|_)(.*?[^\\])\1/g, '$2') // `{t}` | *{t}* | **{t}** | ***{t}*** | _{t}_
.replace(/(\\)(\*|_|`|\!|<)/g, '$2') // remove escape char '\'

const trim = (str: string): string => str.trim()

Expand Down
2 changes: 1 addition & 1 deletion packages/@vuepress/shared-utils/src/removeNonCodeWrappedHTML.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
// Input: "<a> b", Output: "b"
// Input: "`<a>` b", Output: "`<a>` b"
export = function removeNonCodeWrappedHTML (str: string): string {
return String(str).replace(/(^|[^><`])<.*>([^><`]|$)/g, '$1$2')
return String(str).replace(/(^|[^><`\\])<.*>([^><`]|$)/g, '$1$2')
}