aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dotty/tools/dotc/core/Printers.scala3
-rw-r--r--src/dotty/tools/dotc/core/SymDenotations.scala2
-rw-r--r--test/test/ShowClassTests.scala12
-rw-r--r--test/test/showClass.scala8
4 files changed, 14 insertions, 11 deletions
diff --git a/src/dotty/tools/dotc/core/Printers.scala b/src/dotty/tools/dotc/core/Printers.scala
index 6e63eec3a..b6885e7e0 100644
--- a/src/dotty/tools/dotc/core/Printers.scala
+++ b/src/dotty/tools/dotc/core/Printers.scala
@@ -96,9 +96,6 @@ object Printers {
try {
ctx.toTextRecursions += 1
op
-// } catch {
-// case ex: CyclicReference =>
-// s"<cycle involving ${ex.denot}>"
} finally {
ctx.toTextRecursions -= 1
}
diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala
index 2a66c9b7e..6fca0a309 100644
--- a/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -403,7 +403,7 @@ object SymDenotations {
* accessed via prefix `pre`?
*/
def membersNeedAsSeenFrom(pre: Type)(implicit ctx: Context) =
- !( (this is PackageClass)
+ !( this.isStaticOwner
|| ctx.erasedTypes && symbol != defn.ArrayClass
|| (pre eq thisType)
)
diff --git a/test/test/ShowClassTests.scala b/test/test/ShowClassTests.scala
index 25ef7d04b..0119bedad 100644
--- a/test/test/ShowClassTests.scala
+++ b/test/test/ShowClassTests.scala
@@ -31,7 +31,8 @@ class ShowClassTests extends DottyTest {
// they refer to external libraries which are not available
// (apache.ant, usually)
"scala.tools.ant",
- "scala.tools.partest.PartestTask")
+ "scala.tools.partest.PartestTask",
+ "dotty.tools.dotc.core.pickling.AbstractFileReader")
def showPackage(pkg: TermSymbol)(implicit ctx: Context): Unit = {
val path = pkg.fullName.toString
@@ -79,6 +80,11 @@ class ShowClassTests extends DottyTest {
}
@Test
+ def loadJavaClasses() = {
+ showPackage("scala.tools.jline")
+ }
+
+ @Test
def loadMoreClasses() = {
showClasses("scala.collection.JavaConversions")
showClasses("scala.collection.convert.Wrappers")
@@ -110,8 +116,8 @@ class ShowClassTests extends DottyTest {
}
@Test
- def loadJlineHistory() = {
- showPackage("scala.tools.jline.console.history")
+ def loadDotty() = {
+ showPackage("dotty")
}
@Test
diff --git a/test/test/showClass.scala b/test/test/showClass.scala
index f2cb78deb..b0bca09ec 100644
--- a/test/test/showClass.scala
+++ b/test/test/showClass.scala
@@ -6,10 +6,10 @@ object showClass extends ShowClassTests {
def main(args: Array[String]) = {
for (arg <- args) showPackage(ctx.requiredPackage(arg))
- showClasses("scala.tools.jline.WindowsTerminal")
-// showPackage("scala.reflect")
-// showPackage("scala.collection")
-// showPackage("scala")
+// showClasses("dotty.tools.dotc.core.pickling.AbstractFileReader")
+// showPackage("scala.reflect")
+// showPackage("scala.collection")
+ showPackage("dotty")
println("done")
}
}