rewrote resolveVars method #117
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
| @@ -33,7 +35,8 @@ | |||
| */ | |||
| public class ScopedVariables { | |||
|
|
|||
| public static final String CURVE_BRACES_PATTERN = "\\{([^{}]+)\\}"; | |||
| public static final String VARIABLE_NAME_PATTERN = "[{]([\\w]+[\\w.-]+[\\w]+)[}]"; | |||
There was a problem hiding this comment.
такая замена может поломать сценарии, где используются названия переменных на русском.
давай оставим возможность использовать русские названия переменных [a-zA-Zа-яА-Я0-9]
There was a problem hiding this comment.
Добавил русские буквы. Могут поломаться сценарии использующие названия переменных со всякими символами, но думаю это маловероятно и некритично.
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.
Теперь в названии переменных могут быть только английские буквы (заглавные и строчные), цифры, символы ".", "_" и "-". Символы "." и "-" не могут быть в начале и в конце.
Оставил вариант с выбрасыванием исключения. Это не должно создавать проблемы с таким регулярные выражением. Но если что можно будет вместо исключения сделать логирование.