Fix include-tagged when tags are similar#172
Merged
nik9000 merged 3 commits intoelastic:masterfrom May 2, 2017
Merged
Conversation
If one tag is a prefix of another tag then `include-tagged` the suffix could be included instead of the prefix if it came first in the file. This fixes that by expecting the tag to be followed by only spaces and a newline.
resources/extract-tagged.py
Outdated
| import re | ||
| start = re.compile('^(\s+).+tag::' + tag) | ||
| end = re.compile('end::' + tag) | ||
| start = re.compile('^(\s+).+tag::' + tag + '\s*\n') |
Contributor
There was a problem hiding this comment.
\s* will also match \n, so you could do \s*?\n, or maybe even tag + '\b' is sufficient?
Member
Author
|
@clintongormley |
Member
Author
|
@clintongormley can you have a look? I know you are busy but I figured it'd be nice to get this and elastic/elasticsearch#24354 in. |
clintongormley
approved these changes
May 2, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
If one tag is a prefix of another tag then
include-taggedthesuffix could be included instead of the prefix if it came first
in the file. This fixes that by expecting the tag to be followed
by only spaces and a newline.