summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKato Kazuyoshi <kato.kazuyoshi@gmail.com>2011-07-22 01:50:17 +0000
committerKato Kazuyoshi <kato.kazuyoshi@gmail.com>2011-07-22 01:50:17 +0000
commit654c9ff6e67f2c7c49b5a97dba98028406f6c83a (patch)
tree537186666a78f1ff8126658f6c2c85aa684665fb
parentaafc0fe172b8db946ccf74110d2f6fa257ffa094 (diff)
downloadscala-654c9ff6e67f2c7c49b5a97dba98028406f6c83a.tar.gz
scala-654c9ff6e67f2c7c49b5a97dba98028406f6c83a.tar.bz2
scala-654c9ff6e67f2c7c49b5a97dba98028406f6c83a.zip
Should not set the parameter name's width on CSS.
-rw-r--r--src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css7
-rw-r--r--test/scaladoc/resources/SI_4589.scala11
-rw-r--r--test/scaladoc/scala/html/HtmlFactoryTest.scala11
3 files changed, 27 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
index 771fa8f550..84c2d6bfc0 100644
--- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
+++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
@@ -511,6 +511,7 @@ div.fullcomment .block {
padding: 5px 0 0;
border-top: 1px solid #EBEBEB;
margin-top: 5px;
+ overflow: hidden;
}
div.fullcommenttop .block {
@@ -546,12 +547,14 @@ div.fullcomment dl.paramcmts > dt {
display: block;
float: left;
font-weight: bold;
+ min-width: 70px;
}
div.fullcommenttop dl.paramcmts > dd,
div.fullcomment dl.paramcmts > dd {
display: block;
- padding-left: 80px;
+ padding-left: 10px;
+ float: left;
margin-bottom: 5px;
}
@@ -722,4 +725,4 @@ div.fullcomment dl.paramcmts > dd {
#mbrsel .showall span {
color: #4C4C4C;
font-weight: bold;
-}*/
+}*/ \ No newline at end of file
diff --git a/test/scaladoc/resources/SI_4589.scala b/test/scaladoc/resources/SI_4589.scala
new file mode 100644
index 0000000000..d18fd65736
--- /dev/null
+++ b/test/scaladoc/resources/SI_4589.scala
@@ -0,0 +1,11 @@
+class SI_4589 {
+ /**
+ * @param x012345678901234567890123456789 blah blah blah
+ */
+ def foo(x012345678901234567890123456789: Int) = 123
+
+ /**
+ * @param x0123456789 blah blah blah
+ */
+ def bar(x0123456789: Int) = 123
+}
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index ffb93b8930..21bcc29364 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -323,4 +323,15 @@ object Test extends Properties("HtmlFactory") {
case _ => false
}
}
+
+ property("SI-4589") = {
+ createTemplate("SI_4589.scala") match {
+ case node: scala.xml.Node => {
+ val html = node.toString
+ html.contains(">x0123456789: <") &&
+ html.contains(">x012345678901234567890123456789: <")
+ }
+ case _ => false
+ }
+ }
}