summaryrefslogtreecommitdiff
path: root/test/files/presentation/doc/src
diff options
context:
space:
mode:
authorEugene Vigdorchik <eugene.vigdorchik@gmail.com>2013-02-19 21:29:30 +0400
committerEugene Vigdorchik <eugene.vigdorchik@gmail.com>2013-02-24 13:35:35 +0400
commit53c499bec28ccbc7695c79f56e40f98e7732aeb7 (patch)
treecfd6828ad7981ca86ec38404ec50a68e958fa587 /test/files/presentation/doc/src
parent5d6e02ee2eb1b454d88d3c3fb41d4715930caa9d (diff)
downloadscala-53c499bec28ccbc7695c79f56e40f98e7732aeb7.tar.gz
scala-53c499bec28ccbc7695c79f56e40f98e7732aeb7.tar.bz2
scala-53c499bec28ccbc7695c79f56e40f98e7732aeb7.zip
SI-7109 SI-7153 Generalize the API to get docComments: allow to force docTrees
for given fragments. Don't type-check when forcing doc comments, but rather do it directly. Test the new functionality as well as better tests for the old one.
Diffstat (limited to 'test/files/presentation/doc/src')
-rwxr-xr-xtest/files/presentation/doc/src/Class.scala1
-rwxr-xr-xtest/files/presentation/doc/src/Test.scala1
-rwxr-xr-xtest/files/presentation/doc/src/p/Base.scala11
-rwxr-xr-xtest/files/presentation/doc/src/p/Derived.scala9
4 files changed, 21 insertions, 1 deletions
diff --git a/test/files/presentation/doc/src/Class.scala b/test/files/presentation/doc/src/Class.scala
new file mode 100755
index 0000000000..a974bd6f5c
--- /dev/null
+++ b/test/files/presentation/doc/src/Class.scala
@@ -0,0 +1 @@
+object Class \ No newline at end of file
diff --git a/test/files/presentation/doc/src/Test.scala b/test/files/presentation/doc/src/Test.scala
deleted file mode 100755
index fcc1554994..0000000000
--- a/test/files/presentation/doc/src/Test.scala
+++ /dev/null
@@ -1 +0,0 @@
-object Test \ No newline at end of file
diff --git a/test/files/presentation/doc/src/p/Base.scala b/test/files/presentation/doc/src/p/Base.scala
new file mode 100755
index 0000000000..9031de3e3e
--- /dev/null
+++ b/test/files/presentation/doc/src/p/Base.scala
@@ -0,0 +1,11 @@
+package p
+
+/**
+ * @define BaseComment $BaseVar comment.
+ */
+trait Base {
+ /**
+ * Base method has documentation.
+ */
+ def foo: String
+}
diff --git a/test/files/presentation/doc/src/p/Derived.scala b/test/files/presentation/doc/src/p/Derived.scala
new file mode 100755
index 0000000000..1a9c9a26d1
--- /dev/null
+++ b/test/files/presentation/doc/src/p/Derived.scala
@@ -0,0 +1,9 @@
+package p
+
+/**
+ * $BaseComment
+ * @define BaseVar Derived
+ */
+class Derived extends Base {
+ def foo = ""
+}