allow whitespaces before and after java expression #164
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
thunderhook
requested changes
Dec 10, 2023
src/main/resources/org/mapstruct/intellij/messages/MapStructBundle.properties
Outdated
Show resolved
Hide resolved
|
@thunderhook thanks for the feedback. I change the names like you suggested. In addition the properties file is now used to provide the warning message instead of defining it directly inside the java code. |
filiphr
reviewed
Dec 16, 2023
| @@ -49,7 +49,7 @@ | |||
| */ | |||
| public class JavaExpressionInjector implements MultiHostInjector { | |||
|
|
|||
| private static final Pattern JAVA_EXPRESSION = Pattern.compile( "\"java\\(.*\\)\"" ); | |||
| public static final Pattern JAVA_EXPRESSION = Pattern.compile( "\" *java\\(.*\\) *\"" ); | |||
There was a problem hiding this comment.
Perhaps we need to do something like we are doing in core.
See
There was a problem hiding this comment.
I agree. The current implementation is missing the Pattern.DOTALL and does not match all whitespace characters.
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.
mapstruct allows whitespaces before and after the
java( )block. Currently the plugin does not support this.I changed the
JavaExpressionInjectorto allow whitespaces before and after thejava( )block. In addition I added an inspection to check if there are unnecessary whitespaces. If one or more is found before or after thejava( )block, I added two quick fixes to remove allwhitespaces before or after thejava( )block.