diff options
| author | Som Snytt <som.snytt@gmail.com> | 2016-10-15 14:22:51 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2016-10-15 14:22:51 -0700 |
| commit | c71dfa1eefa65d4e8cd61063ea68482af4314913 (patch) | |
| tree | ccc3a508da12c46d7b1dbce11546c457358136bf | |
| parent | 9d3f0777ff883a7c59da3fa7fee156890f51701e (diff) | |
| download | scala-c71dfa1eefa65d4e8cd61063ea68482af4314913.tar.gz scala-c71dfa1eefa65d4e8cd61063ea68482af4314913.tar.bz2 scala-c71dfa1eefa65d4e8cd61063ea68482af4314913.zip | |
SI-6978 No linting of Java parens
Don't lint overriding of nullary by non-nullary
when non-nullary is Java-defined. They can't help it.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t6978.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t6978/J.java | 5 | ||||
| -rw-r--r-- | test/files/pos/t6978/S.scala | 7 |
4 files changed, 14 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") } } diff --git a/test/files/pos/t6978.flags b/test/files/pos/t6978.flags new file mode 100644 index 0000000000..7949c2afa2 --- /dev/null +++ b/test/files/pos/t6978.flags @@ -0,0 +1 @@ +-Xlint -Xfatal-warnings diff --git a/test/files/pos/t6978/J.java b/test/files/pos/t6978/J.java new file mode 100644 index 0000000000..1b9029ce53 --- /dev/null +++ b/test/files/pos/t6978/J.java @@ -0,0 +1,5 @@ + +public class J { + public int f() { return 42; } +} + diff --git a/test/files/pos/t6978/S.scala b/test/files/pos/t6978/S.scala new file mode 100644 index 0000000000..41897db5ac --- /dev/null +++ b/test/files/pos/t6978/S.scala @@ -0,0 +1,7 @@ + +trait X { def f: Int } + +object Test extends J with X with App { + println(f) +} + |