Merge pull request #2281 from kzys/jira-6715

SI-6715 Scaladoc: Use an encoded name if a decoded name is ""

3 files changed, 31 insertions, 0 deletions

diff --git a/test/files/run/t6715.scala b/test/files/run/t6715.scala
new file mode 100644
index 0000000000..07ff34218a
--- /dev/null
+++ b/test/files/run/t6715.scala
@@ -0,0 +1,15 @@
+import scala.reflect.runtime.universe._
+
+class A {
+  def $$ = 1
+  def $times = 1
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val memberSet: Set[String] = typeOf[A].members.map{ _.toString }.toSet
+    assert(memberSet contains "method *")
+    assert(memberSet contains "method $$")
+    assert(! (memberSet contains "method"))
+  }
+}
diff --git a/test/scaladoc/run/SI-6715.check b/test/scaladoc/run/SI-6715.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6715.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6715.scala b/test/scaladoc/run/SI-6715.scala
new file mode 100644
index 0000000000..92d3376234
--- /dev/null
+++ b/test/scaladoc/run/SI-6715.scala
@@ -0,0 +1,15 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+  def scaladocSettings = ""
+
+  override def code = "object A { def $$ = 123 }"
+
+  def testModel(rootPackage: Package) = {
+    import access._
+
+    val method = rootPackage._object("A")._method("$$")
+    assert(method != null)
+  }
+}