Dropping package facades:

- light classes: do not generate light class for package facade
- drop package facades as multifile classes compilation mode support
- get rid of some additional package facade fqName usages
- update tests for light classes
This commit is contained in:
Dmitry Petrov
2015-10-15 18:13:04 +03:00
parent e7fb7483c5
commit 149e70aa07
42 changed files with 60 additions and 373 deletions
@@ -2,22 +2,22 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import test.TestPackage;
import test.*;
class AssignMappedKotlinType {
void test() {
int i1 = TestPackage.getInt();
Integer i2 = TestPackage.getInt();
Number number = TestPackage.getNumber();
String str = TestPackage.getString();
int i1 = AssignMappedKotlinTypeKt.getInt();
Integer i2 = AssignMappedKotlinTypeKt.getInt();
Number number = AssignMappedKotlinTypeKt.getNumber();
String str = AssignMappedKotlinTypeKt.getString();
Collection<Integer> intCollection = TestPackage.getList();
List<Integer> intList = TestPackage.getList();
Collection<Integer> intCollection = AssignMappedKotlinTypeKt.getList();
List<Integer> intList = AssignMappedKotlinTypeKt.getList();
Collection<Integer> intMutableCollection = TestPackage.getMutableList();
List<Integer> intMutableList = TestPackage.getMutableList();
Collection<Integer> intMutableCollection = AssignMappedKotlinTypeKt.getMutableList();
List<Integer> intMutableList = AssignMappedKotlinTypeKt.getMutableList();
Collection<String> stringsCollection = TestPackage.getArrayList();
ArrayList<String> arrayListCollection = TestPackage.getArrayList();
Collection<String> stringsCollection = AssignMappedKotlinTypeKt.getArrayList();
ArrayList<String> arrayListCollection = AssignMappedKotlinTypeKt.getArrayList();
}
}
@@ -1,6 +1,6 @@
import test.kotlin.A;
import static test.kotlin.KotlinPackage.foo;
import static test.kotlin.JvmOverloadsFunctionsKt.foo;
class JvmOverloadsFunctions {
public static void main(String[] args) {
@@ -1,11 +1,11 @@
package test;
import org.jetbrains.annotations.NotNull;
import test.kotlin.KotlinPackage;
import test.kotlin.*;
public class TopLevelFunctionInDataFlowInspection {
void other(@NotNull Object some) {
Object foo = KotlinPackage.foo(some);
Object foo = TopLevelFunctionInDataFlowInspectionKt.foo(some);
}
}
@@ -1,10 +1,10 @@
import test.TestPackage;
package test;
// Check absence of 'Static method reference via subclass warning' for kotlin usages
public class UsingKotlinPackageDeclarations {
public static int test() {
TestPackage.foo();
TestPackage.setBar(15);
return TestPackage.getBar();
UsingKotlinPackageDeclarationsKt.foo();
UsingKotlinPackageDeclarationsKt.setBar(15);
return UsingKotlinPackageDeclarationsKt.getBar();
}
}