azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-2472: Wrong "multiple implementations inherited" diagnostics for JFrame.

Browse Source 
Check whether member is visible when creating fake overrides.

 #KT-2472 Fixed
This commit is contained in:
Pavel V. Talanov
2012-07-20 16:11:16 +04:00
parent d262d06f2d
commit d65b6bc69f
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+14 -10
View File
@@ -190,18 +190,22 @@ public class OverrideResolver {
OverridingUtil.OverrideCompatibilityInfo.Result result = OverridingUtil.OverrideCompatibilityInfo.Result result =
OverridingUtil.isOverridableBy(fromSupertype, fromCurrent).getResult(); OverridingUtil.isOverridableBy(fromSupertype, fromCurrent).getResult();
if (Visibilities.isVisible(fromSupertype, current)) { boolean isVisible = Visibilities.isVisible(fromSupertype, current);
switch (result) { switch (result) {
case OVERRIDABLE: case OVERRIDABLE:
if (isVisible) {
OverridingUtil.bindOverride(fromCurrent, fromSupertype); OverridingUtil.bindOverride(fromCurrent, fromSupertype);
iterator.remove(); }
break; iterator.remove();
case CONFLICT: break;
case CONFLICT:
if (isVisible) {
sink.conflict(fromSupertype, fromCurrent); sink.conflict(fromSupertype, fromCurrent);
break; }
case INCOMPATIBLE: iterator.remove();
break; break;
} case INCOMPATIBLE:
break;
} }
} }
} }
compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.kt
+1 -2
View File
@@ -1,10 +1,9 @@
package test package test
import javax.swing.JFrame import javax.swing.JFrame
/* waiting for KT-1725
class KFrame() : JFrame() { class KFrame() : JFrame() {
{ {
val x = this.accessibleContext // make sure field is visible val x = this.accessibleContext // make sure field is visible
} }
} }
*/