Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7785 from tek/splain-2.13
Integrate splain – implicit resolution chains and type diffs in error messages
- Loading branch information
Showing
29 changed files
with
1,380 additions
and
91 deletions.
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
94 changes: 94 additions & 0 deletions
94
src/compiler/scala/tools/nsc/typechecker/splain/SplainData.scala
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 = { | ||
| if (settings.Vimplicits) { | ||
| if (!nested) errors = List() | ||
| stack = expectedType :: stack | ||
| } | ||
| } | ||
|
|
||
| def finishSearch(success: Boolean, expectedType: Type): Unit = { | ||
| 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) | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
src/compiler/scala/tools/nsc/typechecker/splain/SplainDiagnostics.scala
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.