🥼 Improve suffix citation parsing #757
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fwkoch
approved these changes
Nov 16, 2023
| @@ -25,7 +25,8 @@ export interface Citation { | |||
| export const citationsPlugin: PluginWithOptions = (md) => { | |||
| const regexes = { | |||
| citation: /^([^^-]|[^^].+?)?(-)?@([\w][\w:.#$%&\-+?<>~/]*)(.+)?$/, | |||
| inText: /^@((?:[\w|{][\w:.#$%&\-+?<>~/]*[\w|}])|\w)(\s*)(\[)?/, | |||
| // Only allow a short [suffix] for in text citations (e.g. 50 characters) | |||
| inText: /^@((?:[\w|{][\w:.#$%&\-+?<>~/]*[\w|}])|\w)(\s*)(\[([^\]]{1,50})\])?/, | |||
There was a problem hiding this comment.
So this regex includes the suffix, while the previous did not. That means we are no longer using parseLinkLabel and instead just get the suffix up front as raw text. Probably ok? Certainly makes the code simpler!
There was a problem hiding this comment.
Yeah, the parse link label was taking a lot of content (including other citations and links) and I think we want to be pretty targeted here and ensure that we can close the suffix label properly!
| - type: text | ||
| content: 'These include experimentally produced alkaline magmas from ' | ||
| - type: cite | ||
| content: '@iacovino2016 [`alkaline.xlsx`]' |
There was a problem hiding this comment.
Running this test before your change - this content was enormous! Now it looks nice. 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current version will eagerly parse too many labels including if we turn some of the nesting off. This improvement excludes
[, uses a regexp, and ensures that it is short (50 characters).