Skip to content

Fix sbt scripted tests after refactor in #9343 #9422

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

Merged
merged 1 commit into from
Jul 23, 2020
Merged

Fix sbt scripted tests after refactor in #9343 #9422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 2 deletions sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import scala.language.implicitConversions

import dotty.tools.dotc._
import core._
import Symbols._
import Contexts.Context
import plugins._
import Phases.Phase
Expand Down Expand Up @@ -45,8 +46,8 @@ class InitChecker extends PluginPhase {
private def checkRef(tree: Tree)(implicit ctx: Context): Tree =
if (!checkable(tree.symbol)) tree
else {
val helloPkgSym = ctx.requiredPackage("hello").moduleClass
val libPkgSym = ctx.requiredPackage("lib").moduleClass
val helloPkgSym = requiredPackage("hello").moduleClass
val libPkgSym = requiredPackage("lib").moduleClass
val enclosingPkg = tree.symbol.enclosingPackageClass

if (enclosingPkg == helloPkgSym) { // source code
Expand Down
6 changes: 3 additions & 3 deletions sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/DivideZero.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Phases.Phase
import ast.tpd
import transform.MegaPhase.MiniPhase
import Decorators._
import Symbols.Symbol
import Symbols._
import Constants.Constant
import transform.{Pickler, Staging}

Expand All @@ -26,7 +26,7 @@ class DivideZero extends PluginPhase with StandardPlugin {

private def isNumericDivide(sym: Symbol)(implicit ctx: Context): Boolean = {
def test(tpe: String): Boolean =
(sym.owner eq ctx.requiredClass(tpe)) && sym.name.show == "/"
(sym.owner eq requiredClass(tpe)) && sym.name.show == "/"

test("scala.Int") || test("scala.Long") || test("scala.Short") || test("scala.Float") || test("scala.Double")
}
Expand All @@ -38,4 +38,4 @@ class DivideZero extends PluginPhase with StandardPlugin {
case _ =>
tree
}
}
}