diff options
author | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2013-03-20 00:55:06 +0900 |
---|---|---|
committer | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2013-03-25 20:56:31 +0900 |
commit | b4344e121c7e195f5244cd704d5296274d503dd1 (patch) | |
tree | b465b3e2bc621b8136960dcd7591d7d961f08c53 /test | |
parent | fcc22e22248992abffe2506ddef7c0f7c0b23044 (diff) | |
download | scala-b4344e121c7e195f5244cd704d5296274d503dd1.tar.gz scala-b4344e121c7e195f5244cd704d5296274d503dd1.tar.bz2 scala-b4344e121c7e195f5244cd704d5296274d503dd1.zip |
SI-6580 Scaladoc: Should not close void elements
Because it will generate a useless element like "</img>".
To made matters worse, Scaladoc used to generate the element with
attributes (like </img src="...">). That's why we had SI-6580.
Diffstat (limited to 'test')
-rw-r--r-- | test/scaladoc/run/SI-6580.check | 11 | ||||
-rw-r--r-- | test/scaladoc/run/SI-6580.scala | 32 |
2 files changed, 43 insertions, 0 deletions
diff --git a/test/scaladoc/run/SI-6580.check b/test/scaladoc/run/SI-6580.check new file mode 100644 index 0000000000..2fb6ec3258 --- /dev/null +++ b/test/scaladoc/run/SI-6580.check @@ -0,0 +1,11 @@ +Chain(List(Chain(List(Text(Here z(1) is defined as follows:), Text( +), HtmlTag(<br>), Text( +), Text( ), HtmlTag(<img src='http://example.com/fig1.png'>), Text( +), HtmlTag(<br>), Text( +), Text(plus z(1) times), Text( +), HtmlTag(<br>), Text( +), Text( ), HtmlTag(<img src='http://example.com/fig2.png'>), Text( +), HtmlTag(<br>), Text( +), Text(equals QL of something +))))) +Done. diff --git a/test/scaladoc/run/SI-6580.scala b/test/scaladoc/run/SI-6580.scala new file mode 100644 index 0000000000..c544138f44 --- /dev/null +++ b/test/scaladoc/run/SI-6580.scala @@ -0,0 +1,32 @@ +import scala.tools.nsc.doc +import scala.tools.nsc.doc.model._ +import scala.tools.nsc.doc.html.page.{Index, ReferenceIndex} +import scala.tools.partest.ScaladocModelTest + +object Test extends ScaladocModelTest { + override def scaladocSettings = "" + override def code = """ + + object Test { + /** Here z(1) is defined as follows: + * <br> + * <img src='http://example.com/fig1.png'> + * <br> + * plus z(1) times + * <br> + * <img src='http://example.com/fig2.png'> + * <br> + * equals QL of something + */ + def f = 1 + } + + """ + + def testModel(rootPackage: Package) { + import access._ + + val f = rootPackage._object("Test")._method("f") + println(f.comment.get.short) + } +} |