summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-11-10 17:18:48 +1000
committerGitHub <noreply@github.com>2016-11-10 17:18:48 +1000
commitc39b31cb14a23ba33e669a06cedd4c1be2dc5b60 (patch)
treeeb445ce99eeb2197f737d99a2321855dea8b964d /src/compiler
parente0a0d3d974429531ef2d5283b8468ff8d8290f09 (diff)
parentc71dfa1eefa65d4e8cd61063ea68482af4314913 (diff)
downloadscala-c39b31cb14a23ba33e669a06cedd4c1be2dc5b60.tar.gz
scala-c39b31cb14a23ba33e669a06cedd4c1be2dc5b60.tar.bz2
scala-c39b31cb14a23ba33e669a06cedd4c1be2dc5b60.zip
Merge pull request #5460 from som-snytt/issue/6978
SI-6978 No linting of Java parens
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/RefChecks.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index 106b076eef..116c932365 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -472,7 +472,7 @@ abstract class RefChecks extends Transform {
checkOverrideTypes()
checkOverrideDeprecated()
if (settings.warnNullaryOverride) {
- if (other.paramss.isEmpty && !member.paramss.isEmpty) {
+ if (other.paramss.isEmpty && !member.paramss.isEmpty && !member.isJavaDefined) {
reporter.warning(member.pos, "non-nullary method overrides nullary method")
}
}