Skip to content

Commit d7aceee

Browse files
committed
Tweak other occurrences of isNamedTuple
1 parent d4968e7 commit d7aceee

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

compiler/src/dotty/tools/dotc/interactive/Completion.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ object Completion:
543543
.groupByName
544544

545545
val qualTpe = qual.typeOpt
546-
if qualTpe.isNamedTupleType then
546+
if qualTpe.derivesFromNamedTuple then
547547
namedTupleCompletionsFromType(qualTpe)
548548
else if qualTpe.derivesFrom(defn.SelectableClass) then
549549
val pre = if !TypeOps.isLegalPrefix(qualTpe) then Types.SkolemType(qualTpe) else qualTpe

compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ object PatternMatcher {
107107
// TODO: Drop Case once we use everywhere else `isPatmatGenerated`.
108108

109109
private def dropNamedTuple(tree: Tree): Tree =
110-
val tpe = tree.tpe.widen
110+
val tpe = tree.tpe.widenDealias
111111
if tpe.isNamedTupleType then tree.cast(tpe.stripNamedTuple) else tree
112112

113113
/** The plan `let x = rhs in body(x)` where `x` is a fresh variable */

compiler/src/dotty/tools/dotc/typer/Implicits.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ trait Implicits:
876876
|| inferView(dummyTreeOfType(from), to)
877877
(using ctx.fresh.addMode(Mode.ImplicitExploration).setExploreTyperState()).isSuccess
878878
// TODO: investigate why we can't TyperState#test here
879-
|| from.widen.isNamedTupleType && to.derivesFrom(defn.TupleClass)
879+
|| from.widen.derivesFromNamedTuple && to.derivesFrom(defn.TupleClass)
880880
&& from.widen.stripNamedTuple <:< to
881881
)
882882

compiler/src/dotty/tools/dotc/typer/Typer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2706,7 +2706,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
27062706
body1.isInstanceOf[RefTree] && !isWildcardArg(body1)
27072707
|| body1.isInstanceOf[Literal]
27082708
val symTp =
2709-
if isStableIdentifierOrLiteral || pt.isNamedTupleType then pt
2709+
if isStableIdentifierOrLiteral || pt.dealias.isNamedTupleType then pt
27102710
// need to combine tuple element types with expected named type
27112711
else if isWildcardStarArg(body1)
27122712
|| pt == defn.ImplicitScrutineeTypeRef

0 commit comments

Comments
 (0)