fix: anyOf compare alternatives [create PR into redhat after test] #32
+205
−29
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
p-spacek
changed the title
p-spacek
commented
Oct 24, 2024
| @@ -863,7 +869,7 @@ function validate( | |||
| const val = getNodeValue(node); | |||
| let enumValueMatch = false; | |||
| for (const e of schema.enum) { | |||
| if (equals(val, e) || (callFromAutoComplete && isString(val) && isString(e) && val && e.startsWith(val))) { | |||
| if (equals(val, e) || isAutoCompleteEqualMaybe(callFromAutoComplete, node, val, e)) { | |||
There was a problem hiding this comment.
null value is a good match in auto-completion
| } else if (compareResult === 0) { | ||
| } else if ( | ||
| compareResult === 0 || | ||
| ((node.value === null || node.type === 'null') && node.length === 0) // node with no value can match any schema potentially |
There was a problem hiding this comment.
null yaml value is a good match for sub-schemas, similar to isAutoCompleteEqualMaybe for const and enums
| if ( | ||
| !maxOneMatch && | ||
| !subValidationResult.hasProblems() && | ||
| (!bestMatch.validationResult.hasProblems() || callFromAutoComplete) |
There was a problem hiding this comment.
(!bestMatch.validationResult.hasProblems() || callFromAutoComplete) didn't solve the previous problem properly
problem was when the order of the subschemas in anyOf changed.
this previous fix allows 'issues' only on the previous bestMatch
| } | ||
| } | ||
| return bestMatch; | ||
| } | ||
|
|
||
| function mergeValidationMatches( |
There was a problem hiding this comment.
only refactor - move to separate function, no functional change
| @@ -1289,7 +1289,7 @@ obj: | |||
| 4, | |||
| 18, | |||
| DiagnosticSeverity.Error, | |||
| 'yaml-schema: Package', | |||
| 'yaml-schema: Composer Package', | |||
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.
What does this PR do?
improve compare mechanism that should choose correct schema alternatives
What issues does this PR fix or reference?
fixes this issue redhat-developer#684
replces this PR redhat-developer#759
Is it tested? How?
added tests