diff --git a/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt b/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt index 260fba4bf78..17815c5259a 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt +++ b/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt @@ -6,7 +6,8 @@ public class BadClass { fun foo() { val x: () -> Int = { bar(ArrayList()) - baz>(ArrayList()) + baz>(ArrayList()) + 0 } } diff --git a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt index e6a67265e60..37d46535777 100644 --- a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt +++ b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt @@ -4,5 +4,5 @@ trait B { fun foo(kotlinName: Int) } -class ZAB : A, B -class ZBA : B, A +abstract class ZAB : A, B +abstract class ZBA : B, A diff --git a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.txt b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.txt index da594bb3448..ac153b890a2 100644 --- a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.txt +++ b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.txt @@ -10,12 +10,12 @@ internal trait B { internal abstract fun foo(/*0*/ kotlinName: kotlin.Int): kotlin.Unit } -internal final class ZAB : test.A, test.B { +internal abstract class ZAB : test.A, test.B { public constructor ZAB() public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ kotlinName: kotlin.Int): kotlin.Unit } -internal final class ZBA : test.B, test.A { +internal abstract class ZBA : test.B, test.A { public constructor ZBA() public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ kotlinName: kotlin.Int): kotlin.Unit } diff --git a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt index 99d6845d9e8..cfe35a3d75f 100644 --- a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt +++ b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt @@ -1,5 +1,5 @@ package test class K1 : J() { - override fun foo(l: MutableList): String -} \ No newline at end of file + override fun foo(l: MutableList): String = "" +} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 74acdd9cc83..3a28cd481c2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -193,7 +193,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { ); JetFile jetFile = JetTestUtils.createFile(kotlinSrc.getPath(), FileUtil.loadFile(kotlinSrc, true), environment.getProject()); - AnalyzeExhaust exhaust = JvmResolveUtil.analyzeFilesWithJavaIntegration( + AnalyzeExhaust exhaust = JvmResolveUtil.analyzeFilesWithJavaIntegrationAndCheckForErrors( environment.getProject(), Collections.singleton(jetFile), Predicates.alwaysTrue() ); PackageViewDescriptor packageView = exhaust.getModuleDescriptor().getPackage(TEST_PACKAGE_FQNAME); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 40285bdf77f..4fcf0cfe5dc 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -82,7 +82,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { private PackageViewDescriptor analyzeFileToPackageView(@NotNull File... extraClassPath) throws IOException { Project project = createEnvironment(Arrays.asList(extraClassPath)).getProject(); - AnalyzeExhaust exhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegration( + AnalyzeExhaust exhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors( JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) ); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 2088fca96cf..207d0d0f1ba 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -26,7 +26,6 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.OutputFileCollection; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; @@ -68,12 +67,13 @@ public final class LoadDescriptorUtil { @NotNull File outDir, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind - ) throws IOException { + ) { JetFilesAndExhaust fileAndExhaust = JetFilesAndExhaust.createJetFilesAndAnalyze(kotlinFiles, disposable, configurationKind); - GenerationState state = GenerationUtils.compileFilesGetGenerationState(fileAndExhaust.getJetFiles().get(0).getProject(), fileAndExhaust.getExhaust(), fileAndExhaust.getJetFiles()); - OutputFileCollection outputFiles = state.getFactory(); - OutputUtilsPackage.writeAllTo(outputFiles, outDir); - return fileAndExhaust.getExhaust(); + AnalyzeExhaust exhaust = fileAndExhaust.getExhaust(); + List files = fileAndExhaust.getJetFiles(); + GenerationState state = GenerationUtils.compileFilesGetGenerationState(files.get(0).getProject(), exhaust, files); + OutputUtilsPackage.writeAllTo(state.getFactory(), outDir); + return exhaust; } @NotNull @@ -124,23 +124,20 @@ public final class LoadDescriptorUtil { @NotNull File ktFile, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind - ) throws Exception { + ) { JetFilesAndExhaust fileAndExhaust = JetFilesAndExhaust.createJetFilesAndAnalyze(Collections.singletonList(ktFile), disposable, configurationKind); - PackageViewDescriptor packageView = - fileAndExhaust.getExhaust().getModuleDescriptor().getPackage(TEST_PACKAGE_FQNAME); + PackageViewDescriptor packageView = fileAndExhaust.getExhaust().getModuleDescriptor().getPackage(TEST_PACKAGE_FQNAME); assert packageView != null: TEST_PACKAGE_FQNAME + " package not found in " + ktFile.getName(); return packageView; } private static class JetFilesAndExhaust { - @NotNull public static JetFilesAndExhaust createJetFilesAndAnalyze( @NotNull List kotlinFiles, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind - ) - throws IOException { + ) { final JetCoreEnvironment jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable, configurationKind); List jetFiles = ContainerUtil.map(kotlinFiles, new Function() { @Override @@ -154,18 +151,16 @@ public final class LoadDescriptorUtil { } } }); - AnalyzeExhaust exhaust = JvmResolveUtil.analyzeFilesWithJavaIntegration( + AnalyzeExhaust exhaust = JvmResolveUtil.analyzeFilesWithJavaIntegrationAndCheckForErrors( jetCoreEnvironment.getProject(), jetFiles, Predicates.alwaysTrue()); return new JetFilesAndExhaust(jetFiles, exhaust); } - @NotNull private final List jetFiles; - @NotNull private final AnalyzeExhaust exhaust; - private JetFilesAndExhaust(@NotNull List files, @NotNull AnalyzeExhaust exhaust) { - jetFiles = files; + private JetFilesAndExhaust(@NotNull List jetFiles, @NotNull AnalyzeExhaust exhaust) { + this.jetFiles = jetFiles; this.exhaust = exhaust; } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 0f85b475ccf..f7ab2cc24a0 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -34,7 +33,7 @@ import java.util.Collections; public class JvmResolveUtil { @NotNull - public static AnalyzeExhaust analyzeOneFileWithJavaIntegrationAndCheckForErrors(JetFile file) { + public static AnalyzeExhaust analyzeOneFileWithJavaIntegrationAndCheckForErrors(@NotNull JetFile file) { AnalyzingUtils.checkForSyntacticErrors(file); AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file); @@ -45,23 +44,22 @@ public class JvmResolveUtil { } @NotNull - public static AnalyzeExhaust analyzeOneFileWithJavaIntegration(JetFile file) { + public static AnalyzeExhaust analyzeOneFileWithJavaIntegration(@NotNull JetFile file) { return analyzeFilesWithJavaIntegration(file.getProject(), Collections.singleton(file), Predicates.alwaysTrue()); } @NotNull public static AnalyzeExhaust analyzeFilesWithJavaIntegrationAndCheckForErrors( - Project project, - Collection files, - Predicate filesToAnalyzeCompletely + @NotNull Project project, + @NotNull Collection files, + @NotNull Predicate filesToAnalyzeCompletely ) { for (JetFile file : files) { AnalyzingUtils.checkForSyntacticErrors(file); } - AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration( - project, files, filesToAnalyzeCompletely); + AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration(project, files, filesToAnalyzeCompletely); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -70,24 +68,13 @@ public class JvmResolveUtil { @NotNull public static AnalyzeExhaust analyzeFilesWithJavaIntegration( - Project project, - Collection files, - Predicate filesToAnalyzeCompletely + @NotNull Project project, + @NotNull Collection files, + @NotNull Predicate filesToAnalyzeCompletely ) { BindingTraceContext bindingTraceContext = new BindingTraceContext(); - return analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely - ); - } - - @NotNull - public static AnalyzeExhaust analyzeFilesWithJavaIntegration( - Project project, - Collection files, - BindingTrace trace, - Predicate filesToAnalyzeCompletely - ) { - return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, trace, filesToAnalyzeCompletely, + return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely, AnalyzerFacadeForJVM.createJavaModule(""), MemberFilter.ALWAYS_TRUE); } diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 5381a37233d..1f4cec8c85e 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -49,8 +49,8 @@ public abstract class AbstractResolvedCallsTest() : JetLiteFixture() { val explicitReceiverKind = directives.getExplicitReceiverKind() fun analyzeFileAndGetResolvedCallEntries(): Map> { - val psiFile = JetTestUtils.loadJetFile(getProject(), file) - val analyzeExhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegration(psiFile) + val psiFile = JetTestUtils.loadJetFile(getProject(), file)!! + val analyzeExhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors(psiFile) val bindingContext = analyzeExhaust.getBindingContext() return bindingContext.getSliceContents(BindingContext.RESOLVED_CALL) } diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index eef0ac29810..8a314d163f3 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -33,7 +33,6 @@ import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest.M import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest.MyConstraint import java.util.ArrayList import java.util.LinkedHashMap -import kotlin.properties.Delegates import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { @@ -74,8 +73,8 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { private fun analyzeDeclarations(): MyDeclarations { val fileName = "declarations/declarations.kt" - val psiFile = createPsiFile(null, fileName, loadFile(fileName)) - val analyzeExhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegration(psiFile) + val psiFile = createPsiFile(null, fileName, loadFile(fileName))!! + val analyzeExhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors(psiFile) val bindingContext = analyzeExhaust.getBindingContext() return MyDeclarations(bindingContext, getProject(), typeResolver) } diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index dc467c80ad9..a0f743c7985 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; -import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; @@ -44,7 +43,7 @@ import org.jetbrains.jet.storage.LockBasedStorageManager; import java.util.List; public class JetDefaultModalityModifiersTest extends JetLiteFixture { - private JetDefaultModalityModifiersTestCase tc = new JetDefaultModalityModifiersTestCase(); + private final JetDefaultModalityModifiersTestCase tc = new JetDefaultModalityModifiersTestCase(); @Override protected JetCoreEnvironment createEnvironment() { @@ -64,7 +63,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { } public class JetDefaultModalityModifiersTestCase { - private ModuleDescriptorImpl root = JetTestUtils.createEmptyModule(""); + private final ModuleDescriptorImpl root = JetTestUtils.createEmptyModule(""); private DescriptorResolver descriptorResolver; private JetScope scope; @@ -84,8 +83,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { List declarations = file.getDeclarations(); JetDeclaration aClass = declarations.get(0); assert aClass instanceof JetClass; - AnalyzeExhaust bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegration(file - ); + AnalyzeExhaust bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors(file); DeclarationDescriptor classDescriptor = bindingContext.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, aClass); WritableScopeImpl scope = new WritableScopeImpl( libraryScope, root, RedeclarationHandler.DO_NOTHING, "JetDefaultModalityModifiersTest"); @@ -96,7 +94,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { } private ClassDescriptorWithResolutionScopes createClassDescriptor(ClassKind kind, JetClass aClass) { - MutableClassDescriptor classDescriptor = new MutableClassDescriptor(root, scope, kind, false, Name.identifier(aClass.getName())); + MutableClassDescriptor classDescriptor = new MutableClassDescriptor(root, scope, kind, false, aClass.getNameAsSafeName()); TopDownAnalysisParameters parameters = TopDownAnalysisParameters.create( LockBasedStorageManager.NO_LOCKS, new ExceptionTracker(), Predicates.alwaysTrue(), false, false );