Merge commit 'refs/pull/452/head'; commit 'refs/pull/453/head' into develop

2 files changed, 6 insertions, 18 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala
index 9646ee1cf0..d6102734ab 100644
--- a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala
+++ b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala
@@ -17,15 +17,11 @@ private[tests] trait CoreTestDefs
     extends PresentationCompilerTestDef
     with AskCompletionAt {
 
-    object MemberPrinter {
-      def apply(member: compiler.Member): String =
-        "`" + (member.sym.toString() + member.tpe.toString()).trim() + "`"
-    }
-
-    protected val marker = CompletionMarker
+    def memberPrinter(member: compiler.Member): String =
+        "[accessible: %5s] ".format(member.accessible) + "`" + (member.sym.toString() + member.tpe.toString()).trim() + "`"
 
     override def runTest() {
-      askAllSources(marker) { pos =>
+      askAllSources(CompletionMarker) { pos =>
         askCompletionAt(pos)
       } { (pos, members) =>
         withResponseDelimiter {
@@ -35,7 +31,7 @@ private[tests] trait CoreTestDefs
           reporter.println("retrieved %d members".format(members.size))
           compiler ask { () =>
             val filtered = members.filterNot(member => member.sym.name.toString == "getClass" || member.sym.isConstructor)
-            reporter.println(filtered.map(MemberPrinter(_)).sortBy(_.toString()).mkString("\n"))
+            reporter.println(filtered.map(memberPrinter).sortBy(_.toString()).mkString("\n"))
           }
         }
       }
@@ -48,10 +44,8 @@ private[tests] trait CoreTestDefs
     extends PresentationCompilerTestDef
     with AskTypeAt {
 
-    protected val marker = TypeMarker
-
     override def runTest() {
-      askAllSources(marker) { pos =>
+      askAllSources(TypeMarker) { pos =>
         askTypeAt(pos)
       } { (pos, tree) =>
         withResponseDelimiter {
@@ -69,10 +63,8 @@ private[tests] trait CoreTestDefs
     with AskTypeAt
     with AskCompletionAt {
 
-    protected val marker = HyperlinkMarker
-
     override def runTest() {
-      askAllSources(marker) { pos =>
+      askAllSources(HyperlinkMarker) { pos =>
         askTypeAt(pos)(NullReporter)
       } { (pos, tree) =>
         if(tree.symbol == compiler.NoSymbol) {
diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala
index 390363eca8..8b8be697cc 100644
--- a/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala
+++ b/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala
@@ -5,10 +5,6 @@ import scala.tools.nsc.util.Position
 
 trait PresentationCompilerTestDef {
 
-  def compiler: Global
-
-  protected val marker: TestMarker
-
   private[tests] def runTest(): Unit
 
   protected def withResponseDelimiter(block: => Unit)(implicit reporter: Reporter) {