This repository has been archived by the owner on Feb 21, 2019. It is now read-only.
add support for blockPerLine option #7
Closed
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
Soreine
suggested changes
Oct 11, 2017
|
|
||
| if (!grammar) { | ||
| return text.characters; | ||
| } | ||
|
|
||
| const tokens = Prism.tokenize(string, grammar); | ||
| let offset = 0; | ||
| if (opts.blockPerLine && block === previousBlock) { |
There was a problem hiding this comment.
Caching the last computed tokens is a nice optimization. Improves the first decoration pass.
I'll add it to my PR
| @@ -44,53 +44,113 @@ function PrismPlugin(opts) { | |||
| opts.onlyIn = opts.onlyIn || defaultOnlyIn; | |||
| opts.getSyntax = opts.getSyntax || defaultGetSyntax; | |||
| opts.renderToken = opts.renderToken || defaultTokenRender; | |||
| opts.blockPerLine = opts.blockPerLine || false; | |||
There was a problem hiding this comment.
I was thinking to make it the default behavior (and not have an option for it)
|
|
||
| const gap = Math.max(start - offset, 0) | ||
| let s = offset - start + gap; | ||
| let e = nextOffset - start + gap; |
There was a problem hiding this comment.
I think there's a bug here when nextOffset > end
Testing with this text:
<!-- Some
HTML -->We have a call addMark(0, 18, 'comment') on the first text line, that fails because the comment mark extends beyond the end of the text.
|
I'm glad that you took a look at it. I haven't worked on it since then. I think the only blocker is ianstormtaylor/slate#893 |
|
Closed in favor of #5 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Hey @Soreine this solves #4.
It's a bit convoluted, but I tried to leave as much existing code in place as possible, while keeping the new logic not too crazy to understand.
Basically if
options.blockPerLine, then theblockpassed into the decorator is assumed to be the outer-most block. And it tokenizes that outer-most block's text, and then applies the marks to the individual leaf text nodes.