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

OlivierBlanvillain · web-flow · commit dfbedbed353a · 2019-05-29T11:15:28.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -301,7 +301,7 @@ class Typer extends Namer
                       curOwner
                   effectiveOwner.thisType.select(name, defDenot)
                 }
-              if (!(curOwner.is(Package)) || isDefinedInCurrentUnit(defDenot))
+              if (!curOwner.is(Package) || isDefinedInCurrentUnit(defDenot))
                 result = checkNewOrShadowed(found, definition) // no need to go further out, we found highest prec entry
               else {
                 if (ctx.scala2Mode && !foundUnderScala2.exists)

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ class Typer extends Namer`
`301`	`301`	`curOwner`
`302`	`302`	`effectiveOwner.thisType.select(name, defDenot)`
`303`	`303`	`}`
`304`		`- if (!(curOwner.is(Package)) \|\| isDefinedInCurrentUnit(defDenot))`
	`304`	`+ if (!curOwner.is(Package) \|\| isDefinedInCurrentUnit(defDenot))`
`305`	`305`	`result = checkNewOrShadowed(found, definition) // no need to go further out, we found highest prec entry`
`306`	`306`	`else {`
`307`	`307`	`if (ctx.scala2Mode && !foundUnderScala2.exists)`