Do not show counterintuitive placement for testKind=expression #1283
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
stevedlawrence
approved these changes
Aug 22, 2024
| @@ -164,9 +165,10 @@ abstract class SequenceGroupTermBase(xml: Node, lexicalParent: SchemaComponent, | |||
| protected final lazy val checkIfNonEmptyAndDiscrimsOrAsserts: Unit = { | |||
| val msg = "Counterintuitive placement detected. Wrap the discriminator or assert " + | |||
| "in an empty sequence to evaluate before the contents." | |||
| if (groupMembers.nonEmpty && discriminatorStatements.nonEmpty) | |||
| // Only show warning if the testKind=expression, see DFDL spec Section 9.5 Evaluation Order for Statement Annotations | |||
| if (groupMembers.nonEmpty && discriminatorStatements.filter(_.testKind == TestKind.Expression).nonEmpty) | |||
There was a problem hiding this comment.
Might be a little more clear to do discriminatorStatements.exists(_.testKind == TestKind.Expression)
There was a problem hiding this comment.
Agreed. I always forget about exists()
jadams-tresys
force-pushed
the
DAFFODIL-2912-counterintuitive_placement
branch
from
7b4143f
to
b3202f6
Compare
The counterintuitive placement warning should only be displayed for asserts/disciminators that have testKind=expression. DAFFODIL-2912
jadams-tresys
force-pushed
the
DAFFODIL-2912-counterintuitive_placement
branch
from
b3202f6
to
0599a80
Compare
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.
The counterintuitive placement warning should only be displayed for asserts/disciminators that have testKind=expression.
DAFFODIL-2912