diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyPackageDescriptor.java index 1feca67dc50..13f878a6890 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyPackageDescriptor.java @@ -25,6 +25,9 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; 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; +import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import java.util.Collections; @@ -32,7 +35,7 @@ import java.util.Collections; * @author abreslav */ public class LazyPackageDescriptor extends AbstractNamespaceDescriptorImpl implements NamespaceDescriptor { - private final LazyPackageMemberScope memberScope; + private final JetScope memberScope; public LazyPackageDescriptor( @NotNull NamespaceDescriptorParent containingDeclaration, @@ -41,7 +44,12 @@ public class LazyPackageDescriptor extends AbstractNamespaceDescriptorImpl imple @NotNull PackageMemberDeclarationProvider declarationProvider ) { super(containingDeclaration, Collections.emptyList(), name); - this.memberScope = new LazyPackageMemberScope(resolveSession, declarationProvider, this); + WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, this, RedeclarationHandler.DO_NOTHING, "Package scope for " + name); + //resolveSession.getModuleConfiguration().extendNamespaceScope(resolveSession.getTrace(), this, scope); + LazyPackageMemberScope lazyPackageMemberScope = new LazyPackageMemberScope(resolveSession, declarationProvider, this); + scope.importScope(lazyPackageMemberScope); + scope.changeLockLevel(WritableScope.LockLevel.READING); + this.memberScope = scope; } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index 674e4fe4116..9d14945a2fb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -23,6 +23,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.di.InjectorForLazyResolve; +import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -48,14 +49,17 @@ public class ResolveSession { private final DeclarationProviderFactory declarationProviderFactory; private final InjectorForLazyResolve injector; + private final ModuleConfiguration moduleConfiguration; public ResolveSession( @NotNull Project project, @NotNull ModuleDescriptor rootDescriptor, + @NotNull ModuleConfiguration moduleConfiguration, @NotNull DeclarationProviderFactory declarationProviderFactory ) { this.injector = new InjectorForLazyResolve(project, this, trace); this.module = rootDescriptor; + this.moduleConfiguration = moduleConfiguration; PackageMemberDeclarationProvider provider = declarationProviderFactory.getPackageMemberDeclarationProvider(FqName.ROOT); assert provider != null : "No declaration provider for root package in " + rootDescriptor; this.rootPackage = new LazyPackageDescriptor(rootDescriptor, FqNameUnsafe.ROOT_NAME, this, provider); @@ -69,6 +73,11 @@ public class ResolveSession { return injector; } + @NotNull + public ModuleConfiguration getModuleConfiguration() { + return moduleConfiguration; + } + @Nullable public NamespaceDescriptor getPackageDescriptor(@NotNull Name shortName) { return rootPackage.getMemberScope().getNamespace(shortName); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java index e7ad0ffa212..fee34210a15 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java @@ -79,7 +79,6 @@ public abstract class AbstractLazyResolveComparingTest { InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(project, params, new BindingTraceContext(), module, compilerDependencies); - List files = JetTestUtils .createTestFiles(testFileName, FileUtil.loadFile(new File(testFileName)), new JetTestUtils.TestFileFactory() { @Override @@ -88,11 +87,11 @@ public abstract class AbstractLazyResolveComparingTest { } }); - injector.getTopDownAnalyzer().analyzeFiles(files, Collections.emptyList()); - ModuleDescriptor lazyModule = new ModuleDescriptor(Name.special("")); - ResolveSession session = new ResolveSession(project, lazyModule, new FileBasedDeclarationProviderFactory(files)); + ResolveSession session = new ResolveSession(project, lazyModule, injector.getJavaBridgeConfiguration(), new FileBasedDeclarationProviderFactory(files)); + + injector.getTopDownAnalyzer().analyzeFiles(files, Collections.emptyList()); Pair namespacesToCompare = transform.fun(Pair.create(module, lazyModule)); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java index ee1db7f9f95..5c8a68ece02 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java @@ -26,631 +26,6 @@ import java.util.Set; /* This class is generated by LazyResolveComparingTestGenerator. DO NOT MODIFY MANUALLY */ public class LazyResolveComparingTestGenerated extends AbstractLazyResolveComparingTest { - @Test - public void testClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/Class.kt"); - } - - @Test - public void testClassInnerClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.kt"); - } - - @Test - public void testClassInParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassInParam.kt"); - } - - @Test - public void testClassOutParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassOutParam.kt"); - } - - @Test - public void testClassParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParam.kt"); - } - - @Test - public void testClassParamReferencesParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.kt"); - } - - @Test - public void testClassParamReferencesParam2() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.kt"); - } - - @Test - public void testClassParamReferencesSelf() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.kt"); - } - - @Test - public void testClassParamUpperClassBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.kt"); - } - - @Test - public void testClassParamUpperClassInterfaceBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt"); - } - - @Test - public void testClassParamUpperInterfaceBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt"); - } - - @Test - public void testClassParamUpperInterfaceClassBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt"); - } - - @Test - public void testClassTwoParams() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.kt"); - } - - @Test - public void testClassTwoParams2() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.kt"); - } - - @Test - public void testInheritClassSimple() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.kt"); - } - - @Test - public void testInheritClassWithParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.kt"); - } - - @Test - public void testInheritTraitWithParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.kt"); - } - - @Test - public void testInnerClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InnerClass.kt"); - } - - @Test - public void testInnerClassExtendInnerClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.kt"); - } - - @Test - public void testTrait() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/Trait.kt"); - } - - @Test - public void testClassInParamUsedInFun() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.kt"); - } - - @Test - public void testClassParamUsedInFun() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.kt"); - } - - @Test - public void testFunInParamSuper() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.kt"); - } - - @Test - public void testClassObjectDeclaresVal() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.kt"); - } - - @Test - public void testClassObjectDeclaresVar() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.kt"); - } - - @Test - public void testClassObjectExtendsTrait() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.kt"); - } - - @Test - public void testClassObjectExtendsTraitWithTP() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.kt"); - } - - @Test - public void testSimpleClassObject() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.kt"); - } - - @Test - public void testConstructor0() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/Constructor0.kt"); - } - - @Test - public void testConstructor1() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/Constructor1.kt"); - } - - @Test - public void testConstructor1WithParamDefaultValue() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.kt"); - } - - @Test - public void testConstructorCollectionParameter() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.kt"); - } - - @Test - public void testConstructorWithTwoTypeParameters() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.kt"); - } - - @Test - public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); - } - - @Test - public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); - } - - @Test - public void testConstructorWithTypeParameter() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.kt"); - } - - @Test - public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); - } - - @Test - public void testFunClassParamNotNull() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); - } - - @Test - public void testFunClassParamNullable() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); - } - - @Test - public void testFunParamNullable() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt"); - } - - @Test - public void testReturnTypeClassParamNotNull() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); - } - - @Test - public void testReturnTypeClassParamNullable() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); - } - - @Test - public void testFunGenericParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.kt"); - } - - @Test - public void testFunInParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.kt"); - } - - @Test - public void testFunOutParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.kt"); - } - - @Test - public void testFunParamParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.kt"); - } - - @Test - public void testFunParamParamErased() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt"); - } - - @Test - public void testFunParamReferencesParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); - } - - @Test - public void testFunParamReferencesParam2() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt"); - } - - @Test - public void testFunParamTwoUpperBounds() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); - } - - @Test - public void testFunParamUpperClassBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); - } - - @Test - public void testFunParamUpperClassInterfaceBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); - } - - @Test - public void testFunParamUpperInterfaceBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); - } - - @Test - public void testFunParamUpperInterfaceClassBound() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt"); - } - - @Test - public void testFunParamVaragParam() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.kt"); - } - - @Test - public void testFunTwoTypeParams() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); - } - - @Test - public void testFunTwoTypeParams2() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt"); - } - - @Test - public void testClassFun() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.kt"); - } - - @Test - public void testClassFunGetFoo() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.kt"); - } - - @Test - public void testClassFunGetFooSetFoo() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); - } - - @Test - public void testClassFunSetFoo() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.kt"); - } - - @Test - public void testExtFun() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.kt"); - } - - @Test - public void testExtFunInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.kt"); - } - - @Test - public void testFunDefaultArg() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.kt"); - } - - @Test - public void testFunParamNotNull() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt"); - } - - @Test - public void testFunVarargInt() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.kt"); - } - - @Test - public void testFunVarargInteger() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt"); - } - - @Test - public void testModifierAbstract() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.kt"); - } - - @Test - public void testModifierOpen() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.kt"); - } - - @Test - public void testNsFun() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.kt"); - } - - @Test - public void testNsFunGetFoo() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.kt"); - } - - @Test - public void testReturnTypeNotNull() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt"); - } - - @Test - public void testReturnTypeNullable() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt"); - } - - @Test - public void testClassVal() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ClassVal.kt"); - } - - @Test - public void testClassValAbstract() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.kt"); - } - - @Test - public void testClassVar() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ClassVar.kt"); - } - - @Test - public void testCollectionSize() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/CollectionSize.kt"); - } - - @Test - public void testExtValClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValClass.kt"); - } - - @Test - public void testExtValInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.kt"); - } - - @Test - public void testExtValInt() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValInt.kt"); - } - - @Test - public void testExtValIntCharSequence() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.kt"); - } - - @Test - public void testExtValIntCharSequenceQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.kt"); - } - - @Test - public void testExtValIntListQOfIntInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.kt"); - } - - @Test - public void testExtValIntTInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.kt"); - } - - @Test - public void testExtValIntTQInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.kt"); - } - - @Test - public void testExtValTIntInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.kt"); - } - - @Test - public void testExtVarClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.kt"); - } - - @Test - public void testExtVarInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.kt"); - } - - @Test - public void testExtVarInt() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.kt"); - } - - @Test - public void testExtVarIntTInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.kt"); - } - - @Test - public void testExtVarIntTQInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.kt"); - } - - @Test - public void testExtVarl() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarl.kt"); - } - - @Test - public void testExtVarMapPQInt() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.kt"); - } - - @Test - public void testExtVarTIntInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.kt"); - } - - @Test - public void testExtVarTQIntInClass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.kt"); - } - - @Test - public void testNsVal() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/NsVal.kt"); - } - - @Test - public void testNsVar() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/NsVar.kt"); - } - - @Test - public void testOverrideClassVal() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.kt"); - } - - @Test - public void testOverrideTraitVal() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.kt"); - } - - @Test - public void testPropFromSuperclass() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt"); - } - - @Test - public void testAny() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Any.kt"); - } - - @Test - public void testAnyQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/AnyQ.kt"); - } - - @Test - public void testArrayOfInt() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.kt"); - } - - @Test - public void testArrayOfInteger() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt"); - } - - @Test - public void testArrayOfString() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ArrayOfString.kt"); - } - - @Test - public void testFunction1IntString() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Function1IntString.kt"); - } - - @Test - public void testInt() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Int.kt"); - } - - @Test - public void testIntArray() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/IntArray.kt"); - } - - @Test - public void testIntQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/IntQ.kt"); - } - - @Test - public void testJlInteger() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlInteger.kt"); - } - - @Test - public void testJlIntegerQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.kt"); - } - - @Test - public void testJlObject() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlObject.kt"); - } - - @Test - public void testJlObjectQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlObjectQ.kt"); - } - - @Test - public void testJlString() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlString.kt"); - } - - @Test - public void testJlStringQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlStringQ.kt"); - } - - @Test - public void testListOfAny() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfAny.kt"); - } - - @Test - public void testListOfAnyQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.kt"); - } - - @Test - public void testListOfjlString() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfjlString.kt"); - } - - @Test - public void testListOfStar() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfStar.kt"); - } - - @Test - public void testListOfString() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfString.kt"); - } - - @Test - public void testNothing() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Nothing.kt"); - } - - @Test - public void testNothingQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/NothingQ.kt"); - } - - @Test - public void testString() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/String.kt"); - } - - @Test - public void testStringQ() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/StringQ.kt"); - } - - @Test - public void testTuple0() throws Exception { - doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Tuple0.kt"); - } - @Test public void testGenericFunction() throws Exception { doTest("compiler/testData/lazyResolve/genericFunction.kt"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java index e958b134c2b..1307b12d376 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java @@ -124,7 +124,7 @@ public class LazyResolveComparingTestGenerator { baseTestClassName = "AbstractLazyResolveComparingTest"; //testDataDir = new File("compiler/testData/lazyResolve"); testDataSources = Arrays.asList( - new TestDataSource(new File("compiler/testData/readKotlinBinaryClass"), true, filterFilesByExtension(testDataFileExtension), "doTestSinglePackage"), + //new TestDataSource(new File("compiler/testData/readKotlinBinaryClass"), true, filterFilesByExtension(testDataFileExtension), "doTestSinglePackage"), new TestDataSource(new File("compiler/testData/lazyResolve"), true, filterFilesByExtension(testDataFileExtension), "doTest") ); generatorName = "LazyResolveComparingTestGenerator";