Add newline support by using a regex to parse blockText #22702
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
joshlory
reviewed
May 30, 2018
| * either a real named input like '{VALUE}', a newline, or if it matched a | ||
| * trailing label, nothing. | ||
| */ | ||
| const LABELED_INPUTS_REGEX = /.*?({[^}]*}|\n|$)/gm; |
There was a problem hiding this comment.
Why is the .*? non-greedy match needed at the beginning?
There was a problem hiding this comment.
That matches the label for the input. If it's greedy, it will just consume everything between the beginning of the string and the last input.
It might be clearer to use [^{}]* to match the label, I could go either way.
| const inputs = tokens.map(token => { | ||
| const parts = token.match(LABELED_INPUT_PARTS_REGEX); | ||
| const label = parts[1]; | ||
| const inputName = parts[3]; |
There was a problem hiding this comment.
Not at all blocking, but this makes me wish we had the Babel plugin for named capture groups.
joshlory
reviewed
May 30, 2018
apps/src/block_utils.js
Outdated
| */ | ||
| const LABELED_INPUT_PARTS_REGEX = /(.*?)({([^}]*)}|\n|$)/m; | ||
|
|
||
| const findInputConfig = (args, inputName) => { |
There was a problem hiding this comment.
Maybe clearer as findAndRemoveInputConfig? Not clear initially that this method mutates the args array.
Please add a JSDoc.
joshlory
approved these changes
May 30, 2018
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.
No description provided.