From df9ef74add335178ddbef4c95c117456a851f755 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Fri, 14 Jul 2023 15:39:01 +0200 Subject: [PATCH] Add support for -language:strictEquality --- .../dotty/tools/dotc/evaluation/InsertExpression.scala | 4 +--- .../ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/expression-compiler/src/main/scala-3/dotty/tools/dotc/evaluation/InsertExpression.scala b/modules/expression-compiler/src/main/scala-3/dotty/tools/dotc/evaluation/InsertExpression.scala index e1648d47a..ea86337d4 100644 --- a/modules/expression-compiler/src/main/scala-3/dotty/tools/dotc/evaluation/InsertExpression.scala +++ b/modules/expression-compiler/src/main/scala-3/dotty/tools/dotc/evaluation/InsertExpression.scala @@ -107,9 +107,7 @@ class InsertExpression(using exprCtx: ExpressionContext) extends Phase: | case e: InvocationTargetException => throw e.getCause.nn | | extension [T] (x: T | Null) - | private def nn: T = - | assert(x != null) - | x.asInstanceOf[T] + | private def nn: T = x.asInstanceOf[T] |""".stripMargin override def run(using Context): Unit = diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala index 19090dab0..67c7fed12 100644 --- a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala +++ b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala @@ -2442,7 +2442,7 @@ abstract class Scala3EvaluationTests(scalaVersion: ScalaVersion) extends ScalaEv ) } - test("support for -language:strictEquality".only) { + test("support for -language:strictEquality") { val source = """|package example | @@ -2456,7 +2456,7 @@ abstract class Scala3EvaluationTests(scalaVersion: ScalaVersion) extends ScalaEv Breakpoint(5), DebugStepAssert.inParallel( Evaluation.success("msg == \"\"", false), - Evaluation.failed("msg == 5", "not a member of ClassLoader | Null") + Evaluation.failed("msg == 5", "cannot be compared") ) ) }