Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve error descriptiveness in the parsing API #360

Merged
merged 4 commits into from
Mar 18, 2024
Merged

Improve error descriptiveness in the parsing API #360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f552d01
Fix the error message when there are several variable-length fields
dkhalanskyjb Mar 4, 2024
5f66827
Ensure that creation of ambiguous formats fails
dkhalanskyjb Mar 4, 2024
43a2ef2
Include the full input when unable to construct an object
dkhalanskyjb Mar 4, 2024
4050ce2
Test that input is included in the parsing error messages
dkhalanskyjb Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/common/src/format/DateTimeFormat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ internal sealed class AbstractDateTimeFormat<T, U : Copyable<U>> : DateTimeForma
try {
return valueFromIntermediate(matched)
} catch (e: IllegalArgumentException) {
throw DateTimeFormatException(e.message!!)
throw DateTimeFormatException(when (val message = e.message) {
null -> "The value parsed from '$input' is invalid"
else -> "$message (when parsing '$input')"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's worth adding a test or an overload of assertParsingFails that ensures that the input is present in the message

}, e)
}
}

Expand Down
4 changes: 2 additions & 2 deletions core/common/src/internal/format/FieldFormatDirective.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ internal abstract class NamedUnsignedIntFieldFormatDirective<in Target>(
override fun parser(): ParserStructure<Target> =
ParserStructure(
listOf(
StringSetParserOperation(values, AssignableString(), "One of $values for $name")
StringSetParserOperation(values, AssignableString(), "one of $values for $name")
), emptyList()
)
}
Expand Down Expand Up @@ -142,7 +142,7 @@ internal abstract class NamedEnumIntFieldFormatDirective<in Target, Type>(
override fun parser(): ParserStructure<Target> =
ParserStructure(
listOf(
StringSetParserOperation(mapping.values, AssignableString(), "One of ${mapping.values} for $name")
StringSetParserOperation(mapping.values, AssignableString(), "one of ${mapping.values} for $name")
), emptyList()
)
}
Expand Down