Fix more forms of deprecated annotation

Author: HarrisL2

scaladoc-testcases/src/tests/deprecated.scala

@@ -2,22 +2,61 @@ package tests
 package deprecated
 
 class A:
-  def defInt: Int = 1
+  def defInt: Int
+    = 1
   @deprecated(message = "1")
-  def def1: 1 = 1
+  def def1: 1
+    = 1
   @deprecated("reason")
-  val valInt: Int = 1
-  val val1: 1 = 1
-  var varInt: Int = 1
-  var var1: 1 = 1
+  val valInt: Int
+    = 1
+  val val1: 1
+    = 1
+  var varInt: Int
+    = 1
+  var var1: 1
+    = 1
   class InnerA:
-    val innerVal: Int = 1
+    val innerVal: Int
+      = 1
 
 class B extends A:
   @deprecated(since = "1", message = "some reason")
-  def x: Int = 1
-  val y: Int = 1
+  def x: Int
+    = 1
+  val y: Int
+    = 1
 
-
-@java.lang.Deprecated
-class JavaDeprecated
+class C:
+  /** zero */
+  @deprecated
+  def noInfo: Int
+    = 0
+  /** one */
+  @deprecated()
+  def noInfo2: Int
+    = 0
+  /** two */
+  @deprecated("without names", "2.10.0")
+  def noNames: Int
+    = 0
+  /** three */
+  @deprecated(message = "with names", since = "2.10.0")
+  def withNames: Int
+    = 1
+  /** four */
+  @deprecated(since = "2.10.0", message = "backwards names")
+  def backwardNames: Int
+    = 2
+  /** five */
+  @deprecated("only message")
+  def onlyUnnamedMessage: Int
+    = 0
+  /** six */
+  @deprecated(message = "only named message")
+  def onlyNamedMessage: Int
+    = 1
+  /** seven */
+  @deprecated(since = "2.10.0")
+  def onlyNamedSince: Int
+    = 2

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

@@ -80,8 +80,8 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
         signatureRenderer.renderLink(stripQuotes(text), dri)
       case Annotation.UnresolvedParameter(_, value) => stripQuotes(value)
 
-    val message = a.params.lift(0)
-    val since = a.params.lift(1)
+    val message = a.params.filter(p => p.name.isEmpty || p.name.get != "since").lift(0)
+    val since = a.params.filter(_.name.nonEmpty).find(_.name.get == "since").orElse(a.params.lift(1))
 
     val content = (
       Seq(

scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala

@@ -55,6 +55,8 @@ class GivenSignatures extends SignatureTest("givenSignatures", SignatureTest.all
 
 class Annotations extends SignatureTest("annotations", SignatureTest.all)
 
+class Deprecated extends SignatureTest("deprecated", SignatureTest.all)
+
 class InheritanceLoop extends SignatureTest("inheritanceLoop", SignatureTest.all)
 
 class InheritedMembers extends SignatureTest("inheritedMembers2", SignatureTest.all.filter(_ != "class"),