From 36bdc192b2f170d06354253e82c2b17d78704b82 Mon Sep 17 00:00:00 2001
From: Micro Dotta <mirco.dotta@gmail.com>
Date: Fri, 16 Sep 2011 09:11:56 +0000
Subject: Added new disabled test for eclipse scala-ide t...

Added new disabled test for eclipse scala-ide ticket1000609. Corrected
test framework to fail nicely when the tree retrieved after an has no
associated symbol.
---
 .../nsc/interactive/tests/core/CoreTestDefs.scala  | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'src')

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 bf4708de7f..8d9c545e93 100644
--- a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala
+++ b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala
@@ -3,7 +3,6 @@ package interactive
 package tests.core
 
 import scala.tools.nsc.util.Position
-
 import scala.tools.nsc.interactive.tests.core._
 
 /** Set of core test definitions that are executed for each test run. */
@@ -76,22 +75,27 @@ private[tests] trait CoreTestDefs
       askAllSources(marker) { pos =>
         askTypeAt(pos)(NullReporter)
       } { (pos, tree) =>
-        reporter.println("\naskHyperlinkPos for `" + tree.symbol.name + "` at " + ((pos.line, pos.column)) + " " + pos.source.file.name)
-        val r = new Response[Position]
-        val sourceFile = sourceFiles.find(tree.symbol.sourceFile.path == _.path) match {
-          case Some(source) =>
-            compiler.askLinkPos(tree.symbol, source, r)
-            r.get match {
-              case Left(pos) =>
-                withResponseDelimiter {
-                  reporter.println("[response] found askHyperlinkPos for `" + tree.symbol.name + "` at " + (pos.line, pos.column) + " " + tree.symbol.sourceFile.name)
-                }
-              case Right(ex) =>
-                ex.printStackTrace()
-            }
-          case None =>
-            reporter.println("[error] could not locate sourcefile `" + tree.symbol.sourceFile.name + "`." +
-              "Hint: Does the looked up definition come form a binary?")
+        if(tree.symbol == compiler.NoSymbol) {
+          reporter.println("\nNo symbol is associated with tree: "+tree)
+        }
+        else {
+          reporter.println("\naskHyperlinkPos for `" + tree.symbol.name + "` at " + ((pos.line, pos.column)) + " " + pos.source.file.name)
+          val r = new Response[Position]
+          val sourceFile = sourceFiles.find(tree.symbol.sourceFile.path == _.path) match {
+            case Some(source) =>
+              compiler.askLinkPos(tree.symbol, source, r)
+              r.get match {
+                case Left(pos) =>
+                  withResponseDelimiter {
+                    reporter.println("[response] found askHyperlinkPos for `" + tree.symbol.name + "` at " + (pos.line, pos.column) + " " + tree.symbol.sourceFile.name)
+                  }
+                case Right(ex) =>
+                  ex.printStackTrace()
+              }
+            case None =>
+              reporter.println("[error] could not locate sourcefile `" + tree.symbol.sourceFile.name + "`." +
+                "Hint: Does the looked up definition come form a binary?")
+          }
         }
       }
     }
-- 
cgit v1.2.3