-
-
Notifications
You must be signed in to change notification settings - Fork 205
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.
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
Improve error messages for the Focus
macro.
#1413
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
fc9143f
Improve error messages for the `Focus` macro.
yilinwei 130e8c5
Exclude classes used by the macro only.
yilinwei 27002fa
Add formatting
yilinwei cf63cd3
Make the tuple logic more targeted.
yilinwei 005a28b
Simplify logic
yilinwei File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,16 +26,24 @@ private[focus] trait SelectParserBase extends ParserBase { | |
case None => FocusError.NotAConcreteClass(tpe.show).asResult | ||
} | ||
|
||
def getFieldType(fromType: TypeRepr, fieldName: String): FocusResult[TypeRepr] = { | ||
// We need to do this to support tuples, because even though they conform as case classes in other respects, | ||
// for some reason their field names (_1, _2, etc) have a space at the end, ie `_1 `. | ||
def getTrimmedFieldSymbol(fromTypeSymbol: Symbol): Symbol = | ||
fromTypeSymbol.memberFields.find(_.name.trim == fieldName).getOrElse(Symbol.noSymbol) | ||
private val tupleFieldPattern = "^_[0-9]+$".r | ||
|
||
def getFieldType(fromType: TypeRepr, fieldName: String, pos: Position): FocusResult[TypeRepr] = { | ||
def getFieldSymbol(fromTypeSymbol: Symbol): Symbol = { | ||
// We need to do this to support tuples, because even though they conform as case classes in other respects, | ||
// for some reason their field names (_1, _2, etc) have a space at the end, ie `_1 `. | ||
val f: String => String = | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This fixes a silent error if we have something like case class Foo(x: Int, `x `: Int) since identifiers with leading/trailing spaces are not equivalent. |
||
if (fromType <:< TypeRepr.of[Tuple] && tupleFieldPattern.matches(fieldName)) | ||
_.trim | ||
else | ||
identity | ||
fromTypeSymbol.fieldMembers.find(s => f(s.name) == fieldName).getOrElse(Symbol.noSymbol) | ||
} | ||
|
||
getClassSymbol(fromType).flatMap { fromTypeSymbol => | ||
getTrimmedFieldSymbol(fromTypeSymbol) match { | ||
getFieldSymbol(fromTypeSymbol) match { | ||
case FieldType(possiblyTypeArg) => Right(swapWithSuppliedType(fromType, possiblyTypeArg)) | ||
case _ => FocusError.CouldntFindFieldType(fromType.show, fieldName).asResult | ||
case _ => FocusError.CouldntFindFieldType(fromType.show, fieldName, pos).asResult | ||
} | ||
} | ||
} | ||
|
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dotty macro API has better support for errors now.
As a tangent, I need to see whether we can use the
-explain
flag which would be helpful to expand internal errors.