Dmitriy Novozhilov
c80cfb0fdb
This big refactoring is needed to cleanup building of overrides
mappings and prevent creating redundant intersection overrides in
cases when there is no need in them:
```kotlin
interface A {
fun foo()
}
interface B {
fun foo()
}
interface C : A, B {
override fun foo()
}
```
Before this refactoring there was next override tree:
C.foo
intersection override (A.foo, B.foo)
A.foo
B.foo
Also this commit fixes special mapping of overrides in jvm scopes
for declarations which have kotlin builtins in supertypes with
special java mapping rules (collections, for example)
87 lines
1.4 KiB
Kotlin
Vendored
87 lines
1.4 KiB
Kotlin
Vendored
// FIR_IDENTICAL
|
|
// FILE: CollectionStringImpl.java
|
|
|
|
import java.util.Collection;
|
|
import java.util.Iterator;
|
|
|
|
public class CollectionStringImpl implements Collection<String> {
|
|
@Override
|
|
public int size() {
|
|
return 0;
|
|
}
|
|
|
|
@Override
|
|
public boolean isEmpty() {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean contains(Object o) {
|
|
return false;
|
|
}
|
|
|
|
|
|
@Override
|
|
public Iterator<String> iterator() {
|
|
return null;
|
|
}
|
|
|
|
|
|
@Override
|
|
public Object[] toArray() {
|
|
return new Object[0];
|
|
}
|
|
|
|
|
|
@Override
|
|
public <T> T[] toArray(T[] a) {
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
public boolean add(String s) {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean remove(Object o) {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean containsAll(Collection<?> c) {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean addAll(Collection<? extends String> c) {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean removeAll(Collection<?> c) {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean retainAll(Collection<?> c) {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public void clear() {
|
|
|
|
}
|
|
|
|
public boolean contains(String o) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// FILE: main.kt
|
|
|
|
fun test(x: CollectionStringImpl) {
|
|
x.contains("")
|
|
(x as Collection<String>).contains("")
|
|
}
|