- Added comment inheritance.

2 files changed, 10 insertions, 17 deletions

diff --git a/sources/scala/tools/scaladoc/HTMLGenerator.java b/sources/scala/tools/scaladoc/HTMLGenerator.java
index 72eccb052f..cddf35f9c2 100644
--- a/sources/scala/tools/scaladoc/HTMLGenerator.java
+++ b/sources/scala/tools/scaladoc/HTMLGenerator.java
@@ -383,11 +383,11 @@ public class HTMLGenerator {
 	if (comment == null) {
 	    String s = (String) global.mapSymbolComment.get(sym);
             // comment inheritance
-//             if (s == null) {
-//                 Symbol overriden = ScalaSearch.overridenBySymbol(sym);
-//                 if (overriden != Symbol.NONE)
-//                     s = "/** (inherited comment)" + getComment(overriden).rawText + "*/";
-//             }
+            if (s == null) {
+                Symbol overriden = ScalaSearch.overridenBySymbol(sym);
+                if (overriden != Symbol.NONE)
+                    s = "/** (Inherited comment) " + getComment(overriden).rawText + "*/";
+            }
 	    comment = new Comment(sym, s);
 	    comments.put(sym, comment);
 	}
diff --git a/sources/scala/tools/scaladoc/ScalaSearch.java b/sources/scala/tools/scaladoc/ScalaSearch.java
index 7b1851d5f6..eb1a425aec 100644
--- a/sources/scala/tools/scaladoc/ScalaSearch.java
+++ b/sources/scala/tools/scaladoc/ScalaSearch.java
@@ -457,19 +457,12 @@ public class ScalaSearch {
     }
 
     //////////////////////////// OVERRIDEN SYMBOL //////////////////////////////
-    // Does not work.
+
     public static Symbol overridenBySymbol(Symbol sym) {
-        if (!sym.isRoot()) {
-//             System.out.println(sym.owner().moduleClass().thisType());
-//             System.out.println(sym.owner().moduleClass().info());
-            Type tpe = sym.owner().moduleClass().info();
-            Symbol res = tpe.lookup(sym.name);
-            if (res == Symbol.NONE) return Symbol.NONE;
-            Symbol[] alts = res.alternativeSymbols();
-            for(int i = 0; i < alts.length; i++)
-                if (sym.overrides(alts[i])) return alts[i];
-        }
-        return Symbol.NONE;
+        Type base = Type.compoundTypeWithOwner(sym.owner(),
+                                      sym.owner().info().parents(),
+                                      Scope.EMPTY);
+        return sym.overriddenSymbol(base);
     }
 }