- Fixed for new Identifier def

3 files changed, 17 insertions, 10 deletions

diff --git a/sources/scala/tools/scalac/ast/printer/HTMLPrinter.scala b/sources/scala/tools/scalac/ast/printer/HTMLPrinter.scala
index 0a9f9fc56f..9cf4e4cf6b 100644
--- a/sources/scala/tools/scalac/ast/printer/HTMLPrinter.scala
+++ b/sources/scala/tools/scalac/ast/printer/HTMLPrinter.scala
@@ -143,10 +143,13 @@ class HTMLTreePrinter(stream: OutputStream) extends TextTreePrinter(stream) {
       if (symbol != null) {
 	val attr = if (defined) "name" else "href";
 	startTag("a", attr, symbolAnchor(symbol, usage));
-      }
-      printString(name);
-      if (symbol != null)
+        if (usage == Use)
+          printString(symbol.simpleName().toString());
+        else
+          printString(symbol.name.toString());
 	endTag("a");
+      } else
+        printString(name.toString());
       if (defined) endSpan();
     case _ =>
       super.print(text);
diff --git a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
index 58c1ffa7a9..842bb82cf2 100644
--- a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
+++ b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
@@ -99,7 +99,7 @@ class TextTreePrinter(_out: PrintWriter, autoFlush: boolean) with TreePrinter {
   case class Simple(str: String) extends Text;
   case class Literal(str: String) extends Text;
   case class Keyword(name: String) extends Text;
-  case class Identifier(symbol: Symbol, name: String, usage: SymbolUsage)
+  case class Identifier(symbol: Symbol, name: Name, usage: SymbolUsage)
              extends Text;
   case class Sequence(elements: List[Text]) extends Text;
 
@@ -117,14 +117,14 @@ class TextTreePrinter(_out: PrintWriter, autoFlush: boolean) with TreePrinter {
     case Identifier(sym, name, usage) =>
 
       if (sym != null) {
-        if (usage == SymbolUsage.Use)
+        if (usage == Use)
           printString(sym.simpleName().toString());
         else
           printString(sym.name.toString());
         if (scalac_Global.instance.uniqid)
 	  printString("#" + scalac_Global.instance.uniqueID.id(sym))
       } else {
-        printString(name);
+        printString(name.toString());
       }
     case Sequence(elements) => print(elements)
   }
diff --git a/sources/scalac/ast/printer/HTMLTreePrinter.java b/sources/scalac/ast/printer/HTMLTreePrinter.java
index 8dbd34f2a0..034ae42fb9 100644
--- a/sources/scalac/ast/printer/HTMLTreePrinter.java
+++ b/sources/scalac/ast/printer/HTMLTreePrinter.java
@@ -11,6 +11,7 @@ package scalac.ast.printer;
 
 import scalac.Unit;
 import scalac.symtab.Symbol;
+import scalac.util.Name;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
@@ -145,16 +146,19 @@ public class HTMLTreePrinter extends TextTreePrinter {
             printString(str);
             endSpan();
             break;
-        case Identifier(Symbol symbol, String name, SymbolUsage usage):
+        case Identifier(Symbol symbol, Name name, SymbolUsage usage):
             boolean defined = (usage == SymbolUsage.Definition);
             if (defined) startSpan("idDef");
             if (symbol != null) {
                 String attr = (defined ? "name" : "href");
                 startTag("a", attr, symbolAnchor(symbol, usage));
-            }
-            printString(name);
-            if (symbol != null)
+                if (usage == SymbolUsage.Use)
+                    printString(symbol.simpleName().toString());
+                else
+                    printString(symbol.name.toString());
                 endTag("a");
+            } else
+                printString(name.toString());
             if (defined) endSpan();
             break;
         default: