Merge pull request #10450 from lrytz/t12815

Don't warn nilary / nullary override for bean getters

src/compiler/scala/tools/nsc/typechecker/RefChecks.scala

@@ -452,8 +452,9 @@ abstract class RefChecks extends Transform {
                   else
                     refchecksWarning(member.pos, msg, WarningCategory.OtherNullaryOverride)
               }
-              else if (other.paramss.isEmpty && !member.paramss.isEmpty
-                  && !javaDetermined(member) && !member.overrides.exists(javaDetermined)
+              else if (other.paramss.isEmpty && !member.paramss.isEmpty &&
+                !javaDetermined(member) && !member.overrides.exists(javaDetermined) &&
+                !member.hasAnnotation(BeanPropertyAttr) && !member.hasAnnotation(BooleanBeanPropertyAttr)
               ) {
                 val msg = "method with a single empty parameter list overrides method without any parameter list"
                 if (currentRun.isScala3)

test/files/neg/t12815.check

@@ -0,0 +1,9 @@
+t12815.scala:22: warning: method with a single empty parameter list overrides method without any parameter list
+  def e(): Int = 1 // warn
+      ^
+t12815.scala:23: warning: method without a parameter list overrides a method with a single empty one
+  def f: Int = 1   // warn
+      ^
+error: No warnings can be incurred under -Werror.
+2 warnings
+1 error

test/files/neg/t12815.scala

@@ -0,0 +1,24 @@
+// scalac: -Werror
+
+import scala.beans.BeanProperty
+
+trait T {
+  def getAa: String
+  def getBb(): String
+
+  def c: Int
+  def d(): Int
+
+  def e: Int
+  def f(): Int
+}
+class C extends T {
+  @BeanProperty val aa: String = "" // ok
+  @BeanProperty val bb: String = ""
+
+  val c: Int = 1
+  val d: Int = 1 // ok
+
+  def e(): Int = 1 // warn
+  def f: Int = 1   // warn
+}