From 4a8ab9087f4ed8c65a072341284690cd94ef4ba4 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Wed, 3 Jul 2024 17:54:49 +0200 Subject: [PATCH] Fix compilation errors after cherry-picks --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 +- compiler/test/dotty/tools/repl/TabcompleteTests.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index a7f9bdc6b9fc..7637bb3d5e2a 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -2953,7 +2953,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer typedUnApply(cpy.Apply(tree)(op, l :: r :: Nil), pt) else { val app = typedApply(desugar.binop(l, op, r), pt) - if op.name.isRightAssocOperatorName && !ctx.mode.is(Mode.QuotedExprPattern) then + if op.name.isRightAssocOperatorName && !ctx.mode.is(Mode.QuotedPattern) then val defs = new mutable.ListBuffer[Tree] def lift(app: Tree): Tree = (app: @unchecked) match case Apply(fn, args) => diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala index 0bce525e1469..c7a45f49caea 100644 --- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala +++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala @@ -10,7 +10,7 @@ class TabcompleteTests extends ReplTest { /** Returns the `(, )`*/ private def tabComplete(src: String)(implicit state: State): List[String] = - completions(src.length, src, state).map(_.value).sorted + completions(src.length, src, state).map(_.label).sorted.distinct @Test def tabCompleteList = initially { val comp = tabComplete("List.r")