summaryrefslogtreecommitdiff
path: root/test/scaladoc/resources
diff options
context:
space:
mode:
authorVlad Ureche <vlad.ureche@gmail.com>2012-07-08 23:57:56 +0200
committerVlad Ureche <vlad.ureche@gmail.com>2012-07-16 23:41:44 +0200
commit929415a3f4d5d6261d10cc6d28720c5241716bae (patch)
tree5d3f3e66415e63901730f1d2981a68cadb451436 /test/scaladoc/resources
parent8d0ea747c240e4881c057a78cf2c90e69369ca4b (diff)
downloadscala-929415a3f4d5d6261d10cc6d28720c5241716bae.tar.gz
scala-929415a3f4d5d6261d10cc6d28720c5241716bae.tar.bz2
scala-929415a3f4d5d6261d10cc6d28720c5241716bae.zip
SI-4887 Link existentials in scaladoc
Based on an inital patch by Nada Amin. Rewrote some of the code to compress it a bit. Also fixed a problem that was affecting the prefix printing for typerefs: type parameter and existentials won't get prefixes. While I can imagine cases where you'd want to see where they come from, you can always hover over them and see their origin. Also added support for pretty-printing ThisTypes, SuperTypes and SingleTypes (with links)
Diffstat (limited to 'test/scaladoc/resources')
-rw-r--r--test/scaladoc/resources/SI-3314.scala15
1 files changed, 15 insertions, 0 deletions
diff --git a/test/scaladoc/resources/SI-3314.scala b/test/scaladoc/resources/SI-3314.scala
index e5773a4970..9e0afdce9d 100644
--- a/test/scaladoc/resources/SI-3314.scala
+++ b/test/scaladoc/resources/SI-3314.scala
@@ -1,5 +1,6 @@
package scala.test.scaladoc {
+ // testing inherited <documented> templates (Enum.Value is included in the source, thus is documented in scaladoc)
package test1 {
class Enum {
abstract class Value
@@ -12,6 +13,8 @@ package scala.test.scaladoc {
}
}
+ // testing inherited <not documented> templates (scala.Enumeration.Value is taken from the library, thus is not
+ // documented in the scaladoc pages -- but should be inherited to make things clear!)
package test2 {
trait WeekDayTrait extends Enumeration {
type WeekDay = Value
@@ -67,4 +70,16 @@ package scala.test.scaladoc {
def isWorkingDay9(d: WeekDayObject.Value) = ! (d == Sat || d == Sun)
}
}
+
+ // testing type lambdas and useless prefixes (should be referenced as T instead of foo.T in the first example)
+ package test3 {
+ import language.higherKinds
+ object `package` {
+ trait T
+ trait A
+ trait X
+ def foo[T](x: T) = 7
+ def bar[A](x: ({type Lambda[X] <: Either[A, X]})#Lambda[String]) = 5
+ }
+ }
}