Skip to content

Commit 2b93b5e

Browse files
committed
Streamline check condition
1 parent 49dd708 commit 2b93b5e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ class CheckNoSuperThis extends MiniPhase:
3636
fail(t)
3737
case t: RefTree => t.tpe match
3838
case tpe @ TermRef(prefix, _)
39-
if prefix == cls.thisType && !tpe.symbol.is(JavaStatic) => fail(t)
40-
case tpe @ TermRef(prefix, _)
41-
if cls.is(Module) && prefix.termSymbol == cls.sourceModule && !tpe.symbol.is(JavaStatic) => fail(t)
42-
case tpe @ TermRef(prefix, _)
43-
if cls.is(Module) && tpe.symbol == cls.sourceModule => fail(t)
44-
case _ =>
39+
if (prefix == cls.thisType
40+
|| cls.is(Module)
41+
&& (prefix.termSymbol == cls.sourceModule || tpe.symbol == cls.sourceModule)
42+
) && !tpe.symbol.is(JavaStatic) => fail(t)
4543
case _ =>
4644
}
4745
case _ =>

0 commit comments

Comments
 (0)