Bug fixes #75
Merged
Bug fixes #75
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
rebe1one
changed the title
Jeehut
reviewed
Dec 7, 2017
| @@ -294,7 +294,7 @@ public class StringsFileUpdater { | |||
| // - Returns: An array containing all found translations as tuples in the format `(key, value, comment?)`. | |||
| func findTranslations(inString string: String) -> [TranslationEntry] { | |||
| // comment pattern adapted from http://blog.ostermiller.org/find-comment | |||
| let translationRegexString = "(?:\\s*/\\*(((?:[^*]|(?:\\*+(?:[^*/])))*))\\*+/\\s*)?\\s*(?:^\\s*\"([\\S ]*)\"\\s*=\\s*\"([\\S ]*)\"\\s*;\\s*$)" | |||
| let translationRegexString = "(?:\\s*/\\*(((?:[^*]|(?:\\*+(?:[^*/])))*))\\*+/\\s*)?\\s*(?:^\\s*\"([\\S ]*)\"\\s*=\\s*\"(.*?)\"\\s*;\\s*$)" | |||
There was a problem hiding this comment.
Why's there a question mark in there? Isn't .* already allowing the same as .*??
There was a problem hiding this comment.
.* by itself will match greedily, so it will not stop at the first blahblah"; that it finds. The addition of the question mark makes the match lazy, so it will stop there.
|
I've added a comment. Once that's cleared out I'm happy to merge. |
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.
Fix for issue #65