Integrate splain – implicit resolution chains and type diffs in error messages #7785
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
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 |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Scala (https://www.scala-lang.org) | ||
| * | ||
| * Copyright EPFL and Lightbend, Inc. | ||
| * | ||
| * Licensed under Apache License 2.0 | ||
| * (http://www.apache.org/licenses/LICENSE-2.0). | ||
| * | ||
| * See the NOTICE file distributed with this work for | ||
| * additional information regarding copyright ownership. | ||
| */ | ||
|
|
||
| package scala.tools.nsc | ||
| package typechecker | ||
| package splain | ||
|
|
||
| import scala.util.matching.Regex | ||
|
|
||
| trait SplainData { | ||
| self: Analyzer => | ||
|
|
||
| import global._ | ||
|
|
||
| sealed trait ImplicitErrorSpecifics | ||
|
|
||
| object ImplicitErrorSpecifics { | ||
| case class NotFound(param: Symbol) extends ImplicitErrorSpecifics | ||
|
|
||
| case class NonconformantBounds( | ||
| targs: List[Type], tparams: List[Symbol], originalError: Option[AbsTypeError], | ||
| ) extends ImplicitErrorSpecifics | ||
| } | ||
|
|
||
| object ImplicitErrors { | ||
| var stack: List[Type] = Nil | ||
| var errors: List[ImplicitError] = Nil | ||
|
|
||
| def push(error: ImplicitError): Unit = errors ::= error | ||
| def nesting: Int = stack.length - 1 | ||
| def nested: Boolean = stack.nonEmpty | ||
| def removeErrorsFor(tpe: Type): Unit = errors = errors.dropWhile(_.tpe == tpe) | ||
|
|
||
| def startSearch(expectedType: Type): Unit = { | ||
dwijnand marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (settings.Vimplicits) { | ||
| if (!nested) errors = List() | ||
| stack = expectedType :: stack | ||
| } | ||
| } | ||
|
|
||
| def finishSearch(success: Boolean, expectedType: Type): Unit = { | ||
dwijnand marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (settings.Vimplicits) { | ||
| if (success) removeErrorsFor(expectedType) | ||
| stack = stack.drop(1) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| case class ImplicitError(tpe: Type, candidate: Tree, nesting: Int, specifics: ImplicitErrorSpecifics) { | ||
| import ImplicitError._ | ||
|
|
||
| override def equals(other: Any) = other match { | ||
| case o: ImplicitError => o.tpe.toString == tpe.toString && candidateName(this) == candidateName(o) | ||
| case _ => false | ||
| } | ||
|
|
||
| override def hashCode = (tpe.toString.##, ImplicitError.candidateName(this).##).## | ||
| override def toString = s"ImplicitError(${shortName(tpe.toString)}, ${shortName(candidate.toString)}), $nesting, $specifics)" | ||
| } | ||
|
|
||
| object ImplicitError { | ||
| def unapplyCandidate(e: ImplicitError): Tree = | ||
| e.candidate match { | ||
| case TypeApply(fun, _) => fun | ||
| case a => a | ||
| } | ||
|
|
||
| def candidateName(e: ImplicitError): String = | ||
| unapplyCandidate(e) match { | ||
| case Select(_, name) => name.toString | ||
| case Ident(name) => name.toString | ||
| case a => a.toString | ||
| } | ||
|
|
||
| val candidateRegex: Regex = """.*\.this\.(.*)""".r | ||
|
|
||
| def cleanCandidate(e: ImplicitError): String = | ||
| unapplyCandidate(e).toString match { | ||
| case candidateRegex(suf) => suf | ||
| case a => a | ||
| } | ||
|
|
||
| def shortName(ident: String): String = ident.substring(ident.lastIndexOf(".") + 1) | ||
| } | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Scala (https://www.scala-lang.org) | ||
| * | ||
| * Copyright EPFL and Lightbend, Inc. | ||
| * | ||
| * Licensed under Apache License 2.0 | ||
| * (http://www.apache.org/licenses/LICENSE-2.0). | ||
| * | ||
| * See the NOTICE file distributed with this work for | ||
| * additional information regarding copyright ownership. | ||
| */ | ||
|
|
||
| package scala.tools.nsc | ||
| package typechecker | ||
| package splain | ||
|
|
||
| trait SplainDiagnostics extends splain.SplainFormatting { | ||
| self: Analyzer => | ||
|
|
||
| import global._ | ||
|
|
||
| def splainFoundReqMsg(found: Type, req: Type): String = { | ||
| if (settings.VtypeDiffs) ";\n" + showFormattedL(formatDiff(found, req, top = true), break = true).indent.joinLines | ||
| else "" | ||
| } | ||
| } |
Oops, something went wrong.
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.
Keep?
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.
This were the old style traces which are now handled by splain, no?
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.
That's what I was hoping but not what the tests seem to show. We lose these bits of information: