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($markdown): support path without file extension when importing code snippets #2677

Merged
merged 2 commits into from
Feb 18, 2021
Merged

fix($markdown): support path without file extension when importing code snippets #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e629cd5
fix($markdown): accept snippet paths with no extension
mitjat Oct 23, 2020
8de126f
test($markdown): add unit test for importing path with file extention
billyyyyy3320 Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ exports[`snippet import snippet 1`] = `
// ..
}
</code></pre>
<pre><code># Sample snippet file with no filename extension.
FROM ubuntu:latest
CMD echo hello!
</code></pre>
`;

exports[`snippet import snippet with highlight multiple lines 1`] = `
Expand Down
3 changes: 3 additions & 0 deletions packages/@vuepress/markdown/__tests__/fragments/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Sample snippet file with no filename extension.
FROM ubuntu:latest
CMD echo hello!
2 changes: 2 additions & 0 deletions packages/@vuepress/markdown/__tests__/fragments/code-snippet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<<< @/packages/@vuepress/markdown/__tests__/fragments/snippet.js
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please keep it, it would make sure import path with file extension works fine


<<< @/packages/@vuepress/markdown/__tests__/fragments/Dockerfile
2 changes: 1 addition & 1 deletion packages/@vuepress/markdown/lib/snippet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ module.exports = function snippet (md, options = {}) {
*
* captures: ['/path/to/file.extension', 'extension', '#region', '{meta}']
*/
const rawPathRegexp = /^(.+(?:\.([a-z]+)))(?:(#[\w-]+))?(?: ?({\d+(?:[,-]\d+)*}))?$/
const rawPathRegexp = /^(.+?(?:\.([a-z]+))?)(?:(#[\w-]+))?(?: ?({\d+(?:[,-]\d+)*}))?$/

const rawPath = state.src.slice(start, end).trim().replace(/^@/, root).trim()
const [filename = '', extension = '', region = '', meta = ''] = (rawPathRegexp.exec(rawPath) || []).slice(1)
Expand Down