Fixed parsing several filter arguments with quotes #98
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
kylef
reviewed
Feb 18, 2017
Sources/Tokenizer.swift
Outdated
| @@ -7,18 +7,22 @@ extension String { | |||
| var word = "" | |||
| var components: [String] = [] | |||
| var separate: Character = separator | |||
| var singleQuoteCount = 0 | |||
| var doubleQuteCount = 0 | |||
Tests/StencilTests/FilterSpec.swift
Outdated
|
|
||
| $0.it("allows you to register a custom filter which accepts several arguments") { | ||
| let template = Template(templateString: "{{ name|repeat:'value\"1\"',\"value'2'\",'(key, value)' }}") | ||
|
|
There was a problem hiding this comment.
Theres lots of trailing whitespace here, could you please remove / configure editor not to put these here?
|
@kylef done |
|
@kylef can you please take another looks at this pr? |
|
@ilyapuchka Yes, sorry for delay in getting back to you on some of these PRs. Struggling to find time lately for OSS. I really appreciate all the time and effort you've put in here, I'll make a release shortly with your changes. |
kylef
added a commit
that referenced
this pull request
Apr 18, 2017
|
I'll try tackling #94 tomorrow and then make a release. |
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.
Current version (latest master) incorrectly parses subsequent filter parameters that use quotes, i.e.
name|replace:\"foo\",\"bar\"will give three arguments instead of 2.Internally it creates filter expression with three variables,
"foo",":"and"bar". It inserts unneeded colon because when splitting filter token by colon it splits it intoreplace,"foo"and,"bar", then it drops the first and joins all others with colon. That gives arguments string"foo":,"bar". Then it also incorrectly splits it into"foo",:and"bar".With this fix token is correctly split into
replace,"foo","bar"and then arguments are split into"foo"and"bar"