diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-20 22:46:08 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-20 22:48:34 -0800 |
commit | 9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee (patch) | |
tree | f432c928c34d95ed3a434cf0673828282d93bd5a /test/files/presentation/doc/doc.scala | |
parent | 70956e560a11996e1d801d59b312dfe9d56b7a74 (diff) | |
parent | 2952d0fa020c003e919dff0eea0bc63f7d52fba8 (diff) | |
download | scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.tar.gz scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.tar.bz2 scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.zip |
Merge 2.10.x into master.
Conflicts:
build.number
src/compiler/scala/tools/nsc/doc/base/MemberLookupBase.scala
src/compiler/scala/tools/nsc/typechecker/Macros.scala
test/files/presentation/doc/doc.scala
Diffstat (limited to 'test/files/presentation/doc/doc.scala')
-rwxr-xr-x | test/files/presentation/doc/doc.scala | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/test/files/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala index 21eabeb284..f9ebd09876 100755 --- a/test/files/presentation/doc/doc.scala +++ b/test/files/presentation/doc/doc.scala @@ -7,8 +7,6 @@ import scala.tools.nsc.util._ import scala.tools.nsc.io._ object Test extends InteractiveTest { - override val settings: doc.Settings = docSettings - val tags = Seq( "@example `\"abb\".permutations = Iterator(abb, bab, bba)`", "@version 1.0, 09/07/2012", @@ -29,23 +27,23 @@ object Test extends InteractiveTest { |class User(c: %sCommented)""".stripMargin.format(comment, tags take nTags mkString "\n", caret) override lazy val compiler = { - new { - override val settings = { - prepareSettings(Test.this.settings) - Test.this.settings - } - } with Global(settings, compilerReporter) with MemberLookupBase with CommentFactoryBase { + prepareSettings(settings) + new Global(settings, compilerReporter) with MemberLookupBase with CommentFactoryBase { outer => - val global: this.type = this - def chooseLink(links: List[LinkTo]): LinkTo = links.head - def internalLink(sym: Symbol, site: Symbol) = None - def toString(link: LinkTo) = link.toString override lazy val analyzer = new { val global: outer.type = outer } with doc.ScaladocAnalyzer + def chooseLink(links: List[LinkTo]): LinkTo = links.head + def internalLink(sym: Symbol, site: Symbol) = None + def toString(link: LinkTo) = link.toString + def warnNoLink = false + def findExternalLink(sym: Symbol, name: String) = None + + override def forScaladoc = true + def getComment(sym: Symbol, source: SourceFile) = { val docResponse = new Response[(String, String, Position)] askDocComment(sym, sym.owner, source, docResponse) |