diff --git a/.idea/modules.xml b/.idea/modules.xml index 4959db82cd6..463eb8bb67f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -5,6 +5,7 @@ + diff --git a/idea/src/org/jetbrains/jet/plugin/AnalyzerFacade.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacade.java similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/AnalyzerFacade.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacade.java index ec376a187b8..e0772dbcd28 100644 --- a/idea/src/org/jetbrains/jet/plugin/AnalyzerFacade.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacade.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin; +package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; @@ -6,7 +6,6 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetNamespace; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.JavaDefaultImports; /** * @author abreslav diff --git a/idea/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java similarity index 100% rename from idea/src/org/jetbrains/jet/checkers/CheckerTestUtil.java rename to compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java diff --git a/idea/testData/cfg/ArrayAccess.instructions b/compiler/testData/cfg/ArrayAccess.instructions similarity index 100% rename from idea/testData/cfg/ArrayAccess.instructions rename to compiler/testData/cfg/ArrayAccess.instructions diff --git a/idea/testData/cfg/ArrayAccess.jet b/compiler/testData/cfg/ArrayAccess.jet similarity index 100% rename from idea/testData/cfg/ArrayAccess.jet rename to compiler/testData/cfg/ArrayAccess.jet diff --git a/idea/testData/cfg/Assignments.instructions b/compiler/testData/cfg/Assignments.instructions similarity index 100% rename from idea/testData/cfg/Assignments.instructions rename to compiler/testData/cfg/Assignments.instructions diff --git a/idea/testData/cfg/Assignments.jet b/compiler/testData/cfg/Assignments.jet similarity index 100% rename from idea/testData/cfg/Assignments.jet rename to compiler/testData/cfg/Assignments.jet diff --git a/idea/testData/cfg/Basic.instructions b/compiler/testData/cfg/Basic.instructions similarity index 100% rename from idea/testData/cfg/Basic.instructions rename to compiler/testData/cfg/Basic.instructions diff --git a/idea/testData/cfg/Basic.jet b/compiler/testData/cfg/Basic.jet similarity index 100% rename from idea/testData/cfg/Basic.jet rename to compiler/testData/cfg/Basic.jet diff --git a/idea/testData/cfg/EmptyFunction.instructions b/compiler/testData/cfg/EmptyFunction.instructions similarity index 100% rename from idea/testData/cfg/EmptyFunction.instructions rename to compiler/testData/cfg/EmptyFunction.instructions diff --git a/idea/testData/cfg/EmptyFunction.jet b/compiler/testData/cfg/EmptyFunction.jet similarity index 100% rename from idea/testData/cfg/EmptyFunction.jet rename to compiler/testData/cfg/EmptyFunction.jet diff --git a/idea/testData/cfg/FailFunction.instructions b/compiler/testData/cfg/FailFunction.instructions similarity index 100% rename from idea/testData/cfg/FailFunction.instructions rename to compiler/testData/cfg/FailFunction.instructions diff --git a/idea/testData/cfg/FailFunction.jet b/compiler/testData/cfg/FailFunction.jet similarity index 100% rename from idea/testData/cfg/FailFunction.jet rename to compiler/testData/cfg/FailFunction.jet diff --git a/idea/testData/cfg/Finally.instructions b/compiler/testData/cfg/Finally.instructions similarity index 100% rename from idea/testData/cfg/Finally.instructions rename to compiler/testData/cfg/Finally.instructions diff --git a/idea/testData/cfg/Finally.jet b/compiler/testData/cfg/Finally.jet similarity index 100% rename from idea/testData/cfg/Finally.jet rename to compiler/testData/cfg/Finally.jet diff --git a/idea/testData/cfg/LazyBooleans.instructions b/compiler/testData/cfg/LazyBooleans.instructions similarity index 100% rename from idea/testData/cfg/LazyBooleans.instructions rename to compiler/testData/cfg/LazyBooleans.instructions diff --git a/idea/testData/cfg/LazyBooleans.jet b/compiler/testData/cfg/LazyBooleans.jet similarity index 100% rename from idea/testData/cfg/LazyBooleans.jet rename to compiler/testData/cfg/LazyBooleans.jet diff --git a/idea/testData/cfg/OnlyWhileInFunctionBody.instructions b/compiler/testData/cfg/OnlyWhileInFunctionBody.instructions similarity index 100% rename from idea/testData/cfg/OnlyWhileInFunctionBody.instructions rename to compiler/testData/cfg/OnlyWhileInFunctionBody.instructions diff --git a/idea/testData/cfg/OnlyWhileInFunctionBody.jet b/compiler/testData/cfg/OnlyWhileInFunctionBody.jet similarity index 100% rename from idea/testData/cfg/OnlyWhileInFunctionBody.jet rename to compiler/testData/cfg/OnlyWhileInFunctionBody.jet diff --git a/idea/testData/cfg/ReturnFromExpression.instructions b/compiler/testData/cfg/ReturnFromExpression.instructions similarity index 100% rename from idea/testData/cfg/ReturnFromExpression.instructions rename to compiler/testData/cfg/ReturnFromExpression.instructions diff --git a/idea/testData/cfg/ReturnFromExpression.jet b/compiler/testData/cfg/ReturnFromExpression.jet similarity index 100% rename from idea/testData/cfg/ReturnFromExpression.jet rename to compiler/testData/cfg/ReturnFromExpression.jet diff --git a/idea/testData/cfg/ShortFunction.instructions b/compiler/testData/cfg/ShortFunction.instructions similarity index 100% rename from idea/testData/cfg/ShortFunction.instructions rename to compiler/testData/cfg/ShortFunction.instructions diff --git a/idea/testData/cfg/ShortFunction.jet b/compiler/testData/cfg/ShortFunction.jet similarity index 100% rename from idea/testData/cfg/ShortFunction.jet rename to compiler/testData/cfg/ShortFunction.jet diff --git a/idea/testData/checker/Abstract.jet b/compiler/testData/checker/Abstract.jet similarity index 100% rename from idea/testData/checker/Abstract.jet rename to compiler/testData/checker/Abstract.jet diff --git a/idea/testData/checker/AnonymousInitializers.jet b/compiler/testData/checker/AnonymousInitializers.jet similarity index 100% rename from idea/testData/checker/AnonymousInitializers.jet rename to compiler/testData/checker/AnonymousInitializers.jet diff --git a/idea/testData/checker/BinaryCallsOnNullableValues.jet b/compiler/testData/checker/BinaryCallsOnNullableValues.jet similarity index 100% rename from idea/testData/checker/BinaryCallsOnNullableValues.jet rename to compiler/testData/checker/BinaryCallsOnNullableValues.jet diff --git a/idea/testData/checker/Bounds.jet b/compiler/testData/checker/Bounds.jet similarity index 100% rename from idea/testData/checker/Bounds.jet rename to compiler/testData/checker/Bounds.jet diff --git a/idea/testData/checker/BreakContinue.jet b/compiler/testData/checker/BreakContinue.jet similarity index 100% rename from idea/testData/checker/BreakContinue.jet rename to compiler/testData/checker/BreakContinue.jet diff --git a/idea/testData/checker/Builders.jet b/compiler/testData/checker/Builders.jet similarity index 100% rename from idea/testData/checker/Builders.jet rename to compiler/testData/checker/Builders.jet diff --git a/idea/testData/checker/Casts.jet b/compiler/testData/checker/Casts.jet similarity index 100% rename from idea/testData/checker/Casts.jet rename to compiler/testData/checker/Casts.jet diff --git a/idea/testData/checker/ClassObjects.jet b/compiler/testData/checker/ClassObjects.jet similarity index 100% rename from idea/testData/checker/ClassObjects.jet rename to compiler/testData/checker/ClassObjects.jet diff --git a/idea/testData/checker/Constants.jet b/compiler/testData/checker/Constants.jet similarity index 100% rename from idea/testData/checker/Constants.jet rename to compiler/testData/checker/Constants.jet diff --git a/idea/testData/checker/Constructors.jet b/compiler/testData/checker/Constructors.jet similarity index 100% rename from idea/testData/checker/Constructors.jet rename to compiler/testData/checker/Constructors.jet diff --git a/idea/testData/checker/CyclicHierarchy.jet b/compiler/testData/checker/CyclicHierarchy.jet similarity index 100% rename from idea/testData/checker/CyclicHierarchy.jet rename to compiler/testData/checker/CyclicHierarchy.jet diff --git a/idea/testData/checker/Enums.jet b/compiler/testData/checker/Enums.jet similarity index 100% rename from idea/testData/checker/Enums.jet rename to compiler/testData/checker/Enums.jet diff --git a/idea/testData/checker/ExtensionFunctions.jet b/compiler/testData/checker/ExtensionFunctions.jet similarity index 100% rename from idea/testData/checker/ExtensionFunctions.jet rename to compiler/testData/checker/ExtensionFunctions.jet diff --git a/idea/testData/checker/ForRangeConventions.jet b/compiler/testData/checker/ForRangeConventions.jet similarity index 100% rename from idea/testData/checker/ForRangeConventions.jet rename to compiler/testData/checker/ForRangeConventions.jet diff --git a/idea/testData/checker/FunctionReturnTypes.jet b/compiler/testData/checker/FunctionReturnTypes.jet similarity index 100% rename from idea/testData/checker/FunctionReturnTypes.jet rename to compiler/testData/checker/FunctionReturnTypes.jet diff --git a/idea/testData/checker/GenericArgumentConsistency.jet b/compiler/testData/checker/GenericArgumentConsistency.jet similarity index 100% rename from idea/testData/checker/GenericArgumentConsistency.jet rename to compiler/testData/checker/GenericArgumentConsistency.jet diff --git a/idea/testData/checker/IncDec.jet b/compiler/testData/checker/IncDec.jet similarity index 100% rename from idea/testData/checker/IncDec.jet rename to compiler/testData/checker/IncDec.jet diff --git a/idea/testData/checker/IsExpressions.jet b/compiler/testData/checker/IsExpressions.jet similarity index 100% rename from idea/testData/checker/IsExpressions.jet rename to compiler/testData/checker/IsExpressions.jet diff --git a/idea/testData/checker/MultipleBounds.jet b/compiler/testData/checker/MultipleBounds.jet similarity index 100% rename from idea/testData/checker/MultipleBounds.jet rename to compiler/testData/checker/MultipleBounds.jet diff --git a/idea/testData/checker/NamespaceAsExpression.jet b/compiler/testData/checker/NamespaceAsExpression.jet similarity index 100% rename from idea/testData/checker/NamespaceAsExpression.jet rename to compiler/testData/checker/NamespaceAsExpression.jet diff --git a/idea/testData/checker/NamespaceQualified.jet b/compiler/testData/checker/NamespaceQualified.jet similarity index 100% rename from idea/testData/checker/NamespaceQualified.jet rename to compiler/testData/checker/NamespaceQualified.jet diff --git a/idea/testData/checker/Nullability.jet b/compiler/testData/checker/Nullability.jet similarity index 100% rename from idea/testData/checker/Nullability.jet rename to compiler/testData/checker/Nullability.jet diff --git a/idea/testData/checker/Objects.jet b/compiler/testData/checker/Objects.jet similarity index 100% rename from idea/testData/checker/Objects.jet rename to compiler/testData/checker/Objects.jet diff --git a/idea/testData/checker/Override.jet b/compiler/testData/checker/Override.jet similarity index 100% rename from idea/testData/checker/Override.jet rename to compiler/testData/checker/Override.jet diff --git a/idea/testData/checker/PrimaryConstructors.jet b/compiler/testData/checker/PrimaryConstructors.jet similarity index 100% rename from idea/testData/checker/PrimaryConstructors.jet rename to compiler/testData/checker/PrimaryConstructors.jet diff --git a/idea/testData/checker/ProjectionsInSupertypes.jet b/compiler/testData/checker/ProjectionsInSupertypes.jet similarity index 100% rename from idea/testData/checker/ProjectionsInSupertypes.jet rename to compiler/testData/checker/ProjectionsInSupertypes.jet diff --git a/idea/testData/checker/Properties.jet b/compiler/testData/checker/Properties.jet similarity index 100% rename from idea/testData/checker/Properties.jet rename to compiler/testData/checker/Properties.jet diff --git a/idea/testData/checker/QualifiedExpressions.jet b/compiler/testData/checker/QualifiedExpressions.jet similarity index 100% rename from idea/testData/checker/QualifiedExpressions.jet rename to compiler/testData/checker/QualifiedExpressions.jet diff --git a/idea/testData/checker/QualifiedThis.jet b/compiler/testData/checker/QualifiedThis.jet similarity index 100% rename from idea/testData/checker/QualifiedThis.jet rename to compiler/testData/checker/QualifiedThis.jet diff --git a/idea/testData/checker/RecursiveTypeInference.jet b/compiler/testData/checker/RecursiveTypeInference.jet similarity index 100% rename from idea/testData/checker/RecursiveTypeInference.jet rename to compiler/testData/checker/RecursiveTypeInference.jet diff --git a/idea/testData/checker/Redeclarations.jet b/compiler/testData/checker/Redeclarations.jet similarity index 100% rename from idea/testData/checker/Redeclarations.jet rename to compiler/testData/checker/Redeclarations.jet diff --git a/idea/testData/checker/ResolveToJava.jet b/compiler/testData/checker/ResolveToJava.jet similarity index 100% rename from idea/testData/checker/ResolveToJava.jet rename to compiler/testData/checker/ResolveToJava.jet diff --git a/idea/testData/checker/StringTemplates.jet b/compiler/testData/checker/StringTemplates.jet similarity index 100% rename from idea/testData/checker/StringTemplates.jet rename to compiler/testData/checker/StringTemplates.jet diff --git a/idea/testData/checker/SupertypeListChecks.jet b/compiler/testData/checker/SupertypeListChecks.jet similarity index 100% rename from idea/testData/checker/SupertypeListChecks.jet rename to compiler/testData/checker/SupertypeListChecks.jet diff --git a/idea/testData/checker/TraitSupertypeList.jet b/compiler/testData/checker/TraitSupertypeList.jet similarity index 100% rename from idea/testData/checker/TraitSupertypeList.jet rename to compiler/testData/checker/TraitSupertypeList.jet diff --git a/idea/testData/checker/UnreachableCode.jet b/compiler/testData/checker/UnreachableCode.jet similarity index 100% rename from idea/testData/checker/UnreachableCode.jet rename to compiler/testData/checker/UnreachableCode.jet diff --git a/idea/testData/checker/Unresolved.jet b/compiler/testData/checker/Unresolved.jet similarity index 100% rename from idea/testData/checker/Unresolved.jet rename to compiler/testData/checker/Unresolved.jet diff --git a/idea/testData/checker/Variance.jet b/compiler/testData/checker/Variance.jet similarity index 100% rename from idea/testData/checker/Variance.jet rename to compiler/testData/checker/Variance.jet diff --git a/idea/testData/checker/When.jet b/compiler/testData/checker/When.jet similarity index 100% rename from idea/testData/checker/When.jet rename to compiler/testData/checker/When.jet diff --git a/idea/testData/checker/infos/Autocasts.jet b/compiler/testData/checker/infos/Autocasts.jet similarity index 100% rename from idea/testData/checker/infos/Autocasts.jet rename to compiler/testData/checker/infos/Autocasts.jet diff --git a/idea/testData/checker/infos/PropertiesWithBackingFields.jet b/compiler/testData/checker/infos/PropertiesWithBackingFields.jet similarity index 100% rename from idea/testData/checker/infos/PropertiesWithBackingFields.jet rename to compiler/testData/checker/infos/PropertiesWithBackingFields.jet diff --git a/idea/testData/checker/infos/WrapIntoRef.jet b/compiler/testData/checker/infos/WrapIntoRef.jet similarity index 100% rename from idea/testData/checker/infos/WrapIntoRef.jet rename to compiler/testData/checker/infos/WrapIntoRef.jet diff --git a/idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet b/compiler/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet similarity index 100% rename from idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet rename to compiler/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet diff --git a/idea/testData/checker/regression/AssignmentsUnderOperators.jet b/compiler/testData/checker/regression/AssignmentsUnderOperators.jet similarity index 100% rename from idea/testData/checker/regression/AssignmentsUnderOperators.jet rename to compiler/testData/checker/regression/AssignmentsUnderOperators.jet diff --git a/idea/testData/checker/regression/CoercionToUnit.jet b/compiler/testData/checker/regression/CoercionToUnit.jet similarity index 100% rename from idea/testData/checker/regression/CoercionToUnit.jet rename to compiler/testData/checker/regression/CoercionToUnit.jet diff --git a/idea/testData/checker/regression/DoubleDefine.jet b/compiler/testData/checker/regression/DoubleDefine.jet similarity index 100% rename from idea/testData/checker/regression/DoubleDefine.jet rename to compiler/testData/checker/regression/DoubleDefine.jet diff --git a/idea/testData/checker/regression/Jet11.jet b/compiler/testData/checker/regression/Jet11.jet similarity index 100% rename from idea/testData/checker/regression/Jet11.jet rename to compiler/testData/checker/regression/Jet11.jet diff --git a/idea/testData/checker/regression/Jet121.jet b/compiler/testData/checker/regression/Jet121.jet similarity index 100% rename from idea/testData/checker/regression/Jet121.jet rename to compiler/testData/checker/regression/Jet121.jet diff --git a/idea/testData/checker/regression/Jet124.jet b/compiler/testData/checker/regression/Jet124.jet similarity index 100% rename from idea/testData/checker/regression/Jet124.jet rename to compiler/testData/checker/regression/Jet124.jet diff --git a/idea/testData/checker/regression/Jet169.jet b/compiler/testData/checker/regression/Jet169.jet similarity index 100% rename from idea/testData/checker/regression/Jet169.jet rename to compiler/testData/checker/regression/Jet169.jet diff --git a/idea/testData/checker/regression/Jet17.jet b/compiler/testData/checker/regression/Jet17.jet similarity index 100% rename from idea/testData/checker/regression/Jet17.jet rename to compiler/testData/checker/regression/Jet17.jet diff --git a/idea/testData/checker/regression/Jet183-1.jet b/compiler/testData/checker/regression/Jet183-1.jet similarity index 100% rename from idea/testData/checker/regression/Jet183-1.jet rename to compiler/testData/checker/regression/Jet183-1.jet diff --git a/idea/testData/checker/regression/Jet183.jet b/compiler/testData/checker/regression/Jet183.jet similarity index 100% rename from idea/testData/checker/regression/Jet183.jet rename to compiler/testData/checker/regression/Jet183.jet diff --git a/idea/testData/checker/regression/Jet53.jet b/compiler/testData/checker/regression/Jet53.jet similarity index 100% rename from idea/testData/checker/regression/Jet53.jet rename to compiler/testData/checker/regression/Jet53.jet diff --git a/idea/testData/checker/regression/Jet67.jet b/compiler/testData/checker/regression/Jet67.jet similarity index 100% rename from idea/testData/checker/regression/Jet67.jet rename to compiler/testData/checker/regression/Jet67.jet diff --git a/idea/testData/checker/regression/Jet68.jet b/compiler/testData/checker/regression/Jet68.jet similarity index 100% rename from idea/testData/checker/regression/Jet68.jet rename to compiler/testData/checker/regression/Jet68.jet diff --git a/idea/testData/checker/regression/Jet69.jet b/compiler/testData/checker/regression/Jet69.jet similarity index 100% rename from idea/testData/checker/regression/Jet69.jet rename to compiler/testData/checker/regression/Jet69.jet diff --git a/idea/testData/checker/regression/Jet72.jet b/compiler/testData/checker/regression/Jet72.jet similarity index 100% rename from idea/testData/checker/regression/Jet72.jet rename to compiler/testData/checker/regression/Jet72.jet diff --git a/idea/testData/checker/regression/Jet81.jet b/compiler/testData/checker/regression/Jet81.jet similarity index 100% rename from idea/testData/checker/regression/Jet81.jet rename to compiler/testData/checker/regression/Jet81.jet diff --git a/idea/testData/checker/regression/OverrideResolution.jet b/compiler/testData/checker/regression/OverrideResolution.jet similarity index 100% rename from idea/testData/checker/regression/OverrideResolution.jet rename to compiler/testData/checker/regression/OverrideResolution.jet diff --git a/idea/testData/checker/regression/ScopeForSecondaryConstructors.jet b/compiler/testData/checker/regression/ScopeForSecondaryConstructors.jet similarity index 100% rename from idea/testData/checker/regression/ScopeForSecondaryConstructors.jet rename to compiler/testData/checker/regression/ScopeForSecondaryConstructors.jet diff --git a/idea/testData/checker/regression/SpecififcityByReceiver.jet b/compiler/testData/checker/regression/SpecififcityByReceiver.jet similarity index 100% rename from idea/testData/checker/regression/SpecififcityByReceiver.jet rename to compiler/testData/checker/regression/SpecififcityByReceiver.jet diff --git a/idea/testData/checker/regression/ThisConstructorInGenericClass.jet b/compiler/testData/checker/regression/ThisConstructorInGenericClass.jet similarity index 100% rename from idea/testData/checker/regression/ThisConstructorInGenericClass.jet rename to compiler/testData/checker/regression/ThisConstructorInGenericClass.jet diff --git a/idea/testData/checker/regression/WrongTraceInCallResolver.jet b/compiler/testData/checker/regression/WrongTraceInCallResolver.jet similarity index 100% rename from idea/testData/checker/regression/WrongTraceInCallResolver.jet rename to compiler/testData/checker/regression/WrongTraceInCallResolver.jet diff --git a/idea/testData/checker/regression/kt251.jet b/compiler/testData/checker/regression/kt251.jet similarity index 100% rename from idea/testData/checker/regression/kt251.jet rename to compiler/testData/checker/regression/kt251.jet diff --git a/idea/testData/checker/regression/kt303.jet b/compiler/testData/checker/regression/kt303.jet similarity index 100% rename from idea/testData/checker/regression/kt303.jet rename to compiler/testData/checker/regression/kt303.jet diff --git a/idea/testData/checkerWithErrorTypes/checkerTestUtil/test.jet b/compiler/testData/checkerWithErrorTypes/checkerTestUtil/test.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/checkerTestUtil/test.jet rename to compiler/testData/checkerWithErrorTypes/checkerTestUtil/test.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Abstract.jet b/compiler/testData/checkerWithErrorTypes/full/Abstract.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Abstract.jet rename to compiler/testData/checkerWithErrorTypes/full/Abstract.jet diff --git a/idea/testData/checkerWithErrorTypes/full/AnonymousInitializers.jet b/compiler/testData/checkerWithErrorTypes/full/AnonymousInitializers.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/AnonymousInitializers.jet rename to compiler/testData/checkerWithErrorTypes/full/AnonymousInitializers.jet diff --git a/idea/testData/checkerWithErrorTypes/full/BinaryCallsOnNullableValues.jet b/compiler/testData/checkerWithErrorTypes/full/BinaryCallsOnNullableValues.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/BinaryCallsOnNullableValues.jet rename to compiler/testData/checkerWithErrorTypes/full/BinaryCallsOnNullableValues.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Bounds.jet b/compiler/testData/checkerWithErrorTypes/full/Bounds.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Bounds.jet rename to compiler/testData/checkerWithErrorTypes/full/Bounds.jet diff --git a/idea/testData/checkerWithErrorTypes/full/BreakContinue.jet b/compiler/testData/checkerWithErrorTypes/full/BreakContinue.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/BreakContinue.jet rename to compiler/testData/checkerWithErrorTypes/full/BreakContinue.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Builders.jet b/compiler/testData/checkerWithErrorTypes/full/Builders.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Builders.jet rename to compiler/testData/checkerWithErrorTypes/full/Builders.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Casts.jet b/compiler/testData/checkerWithErrorTypes/full/Casts.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Casts.jet rename to compiler/testData/checkerWithErrorTypes/full/Casts.jet diff --git a/idea/testData/checkerWithErrorTypes/full/ClassObjects.jet b/compiler/testData/checkerWithErrorTypes/full/ClassObjects.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/ClassObjects.jet rename to compiler/testData/checkerWithErrorTypes/full/ClassObjects.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Constants.jet b/compiler/testData/checkerWithErrorTypes/full/Constants.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Constants.jet rename to compiler/testData/checkerWithErrorTypes/full/Constants.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Constructors.jet b/compiler/testData/checkerWithErrorTypes/full/Constructors.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Constructors.jet rename to compiler/testData/checkerWithErrorTypes/full/Constructors.jet diff --git a/idea/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet b/compiler/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet rename to compiler/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet diff --git a/idea/testData/checkerWithErrorTypes/full/CyclicHierarchy.jet b/compiler/testData/checkerWithErrorTypes/full/CyclicHierarchy.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/CyclicHierarchy.jet rename to compiler/testData/checkerWithErrorTypes/full/CyclicHierarchy.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Enums.jet b/compiler/testData/checkerWithErrorTypes/full/Enums.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Enums.jet rename to compiler/testData/checkerWithErrorTypes/full/Enums.jet diff --git a/idea/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet b/compiler/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet rename to compiler/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet diff --git a/idea/testData/checkerWithErrorTypes/full/ForRangeConventions.jet b/compiler/testData/checkerWithErrorTypes/full/ForRangeConventions.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/ForRangeConventions.jet rename to compiler/testData/checkerWithErrorTypes/full/ForRangeConventions.jet diff --git a/idea/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet b/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet rename to compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet diff --git a/idea/testData/checkerWithErrorTypes/full/GenericArgumentConsistency.jet b/compiler/testData/checkerWithErrorTypes/full/GenericArgumentConsistency.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/GenericArgumentConsistency.jet rename to compiler/testData/checkerWithErrorTypes/full/GenericArgumentConsistency.jet diff --git a/idea/testData/checkerWithErrorTypes/full/IllegalModifiers.jet b/compiler/testData/checkerWithErrorTypes/full/IllegalModifiers.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/IllegalModifiers.jet rename to compiler/testData/checkerWithErrorTypes/full/IllegalModifiers.jet diff --git a/idea/testData/checkerWithErrorTypes/full/IncDec.jet b/compiler/testData/checkerWithErrorTypes/full/IncDec.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/IncDec.jet rename to compiler/testData/checkerWithErrorTypes/full/IncDec.jet diff --git a/idea/testData/checkerWithErrorTypes/full/IsExpressions.jet b/compiler/testData/checkerWithErrorTypes/full/IsExpressions.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/IsExpressions.jet rename to compiler/testData/checkerWithErrorTypes/full/IsExpressions.jet diff --git a/idea/testData/checkerWithErrorTypes/full/MultipleBounds.jet b/compiler/testData/checkerWithErrorTypes/full/MultipleBounds.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/MultipleBounds.jet rename to compiler/testData/checkerWithErrorTypes/full/MultipleBounds.jet diff --git a/idea/testData/checkerWithErrorTypes/full/NamespaceAsExpression.jet b/compiler/testData/checkerWithErrorTypes/full/NamespaceAsExpression.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/NamespaceAsExpression.jet rename to compiler/testData/checkerWithErrorTypes/full/NamespaceAsExpression.jet diff --git a/idea/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet b/compiler/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet rename to compiler/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet diff --git a/idea/testData/checkerWithErrorTypes/full/NamespaceQualified.jet b/compiler/testData/checkerWithErrorTypes/full/NamespaceQualified.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/NamespaceQualified.jet rename to compiler/testData/checkerWithErrorTypes/full/NamespaceQualified.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Nullability.jet b/compiler/testData/checkerWithErrorTypes/full/Nullability.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Nullability.jet rename to compiler/testData/checkerWithErrorTypes/full/Nullability.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Objects.jet b/compiler/testData/checkerWithErrorTypes/full/Objects.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Objects.jet rename to compiler/testData/checkerWithErrorTypes/full/Objects.jet diff --git a/idea/testData/checkerWithErrorTypes/full/PrimaryConstructors.jet b/compiler/testData/checkerWithErrorTypes/full/PrimaryConstructors.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/PrimaryConstructors.jet rename to compiler/testData/checkerWithErrorTypes/full/PrimaryConstructors.jet diff --git a/idea/testData/checkerWithErrorTypes/full/ProjectionsInSupertypes.jet b/compiler/testData/checkerWithErrorTypes/full/ProjectionsInSupertypes.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/ProjectionsInSupertypes.jet rename to compiler/testData/checkerWithErrorTypes/full/ProjectionsInSupertypes.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Properties.jet b/compiler/testData/checkerWithErrorTypes/full/Properties.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Properties.jet rename to compiler/testData/checkerWithErrorTypes/full/Properties.jet diff --git a/idea/testData/checkerWithErrorTypes/full/QualifiedExpressions.jet b/compiler/testData/checkerWithErrorTypes/full/QualifiedExpressions.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/QualifiedExpressions.jet rename to compiler/testData/checkerWithErrorTypes/full/QualifiedExpressions.jet diff --git a/idea/testData/checkerWithErrorTypes/full/QualifiedThis.jet b/compiler/testData/checkerWithErrorTypes/full/QualifiedThis.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/QualifiedThis.jet rename to compiler/testData/checkerWithErrorTypes/full/QualifiedThis.jet diff --git a/idea/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet b/compiler/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet rename to compiler/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Redeclarations.jet b/compiler/testData/checkerWithErrorTypes/full/Redeclarations.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Redeclarations.jet rename to compiler/testData/checkerWithErrorTypes/full/Redeclarations.jet diff --git a/idea/testData/checkerWithErrorTypes/full/ResolveToJava.jet b/compiler/testData/checkerWithErrorTypes/full/ResolveToJava.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/ResolveToJava.jet rename to compiler/testData/checkerWithErrorTypes/full/ResolveToJava.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Return.jet b/compiler/testData/checkerWithErrorTypes/full/Return.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Return.jet rename to compiler/testData/checkerWithErrorTypes/full/Return.jet diff --git a/idea/testData/checkerWithErrorTypes/full/StringTemplates.jet b/compiler/testData/checkerWithErrorTypes/full/StringTemplates.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/StringTemplates.jet rename to compiler/testData/checkerWithErrorTypes/full/StringTemplates.jet diff --git a/idea/testData/checkerWithErrorTypes/full/SupertypeListChecks.jet b/compiler/testData/checkerWithErrorTypes/full/SupertypeListChecks.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/SupertypeListChecks.jet rename to compiler/testData/checkerWithErrorTypes/full/SupertypeListChecks.jet diff --git a/idea/testData/checkerWithErrorTypes/full/TraitSupertypeList.jet b/compiler/testData/checkerWithErrorTypes/full/TraitSupertypeList.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/TraitSupertypeList.jet rename to compiler/testData/checkerWithErrorTypes/full/TraitSupertypeList.jet diff --git a/idea/testData/checkerWithErrorTypes/full/UnreachableCode.jet b/compiler/testData/checkerWithErrorTypes/full/UnreachableCode.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/UnreachableCode.jet rename to compiler/testData/checkerWithErrorTypes/full/UnreachableCode.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Unresolved.jet b/compiler/testData/checkerWithErrorTypes/full/Unresolved.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Unresolved.jet rename to compiler/testData/checkerWithErrorTypes/full/Unresolved.jet diff --git a/idea/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet b/compiler/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet rename to compiler/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet diff --git a/idea/testData/checkerWithErrorTypes/full/Variance.jet b/compiler/testData/checkerWithErrorTypes/full/Variance.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/Variance.jet rename to compiler/testData/checkerWithErrorTypes/full/Variance.jet diff --git a/idea/testData/checkerWithErrorTypes/full/When.jet b/compiler/testData/checkerWithErrorTypes/full/When.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/When.jet rename to compiler/testData/checkerWithErrorTypes/full/When.jet diff --git a/idea/testData/checkerWithErrorTypes/full/infos/Autocasts.jet b/compiler/testData/checkerWithErrorTypes/full/infos/Autocasts.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/infos/Autocasts.jet rename to compiler/testData/checkerWithErrorTypes/full/infos/Autocasts.jet diff --git a/idea/testData/checkerWithErrorTypes/full/infos/PropertiesWithBackingFields.jet b/compiler/testData/checkerWithErrorTypes/full/infos/PropertiesWithBackingFields.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/infos/PropertiesWithBackingFields.jet rename to compiler/testData/checkerWithErrorTypes/full/infos/PropertiesWithBackingFields.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/AmbiguityOnLazyTypeComputation.jet b/compiler/testData/checkerWithErrorTypes/full/regression/AmbiguityOnLazyTypeComputation.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/AmbiguityOnLazyTypeComputation.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/AmbiguityOnLazyTypeComputation.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet b/compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/CoercionToUnit.jet b/compiler/testData/checkerWithErrorTypes/full/regression/CoercionToUnit.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/CoercionToUnit.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/CoercionToUnit.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet b/compiler/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet11.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet11.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet11.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet11.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet121.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet121.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet121.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet121.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet124.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet124.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet124.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet124.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet169.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet169.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet169.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet169.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet17.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet17.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet17.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet17.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet183.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet183.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet183.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet183.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet53.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet53.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet53.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet53.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet67.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet67.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet67.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet67.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet68.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet68.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet68.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet68.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet69.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet69.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet69.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet69.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet72.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet72.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet72.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet72.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/Jet81.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet81.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/Jet81.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/Jet81.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet b/compiler/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/ScopeForSecondaryConstructors.jet b/compiler/testData/checkerWithErrorTypes/full/regression/ScopeForSecondaryConstructors.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/ScopeForSecondaryConstructors.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/ScopeForSecondaryConstructors.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/SpecififcityByReceiver.jet b/compiler/testData/checkerWithErrorTypes/full/regression/SpecififcityByReceiver.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/SpecififcityByReceiver.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/SpecififcityByReceiver.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/ThisConstructorInGenericClass.jet b/compiler/testData/checkerWithErrorTypes/full/regression/ThisConstructorInGenericClass.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/ThisConstructorInGenericClass.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/ThisConstructorInGenericClass.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/WrongTraceInCallResolver.jet b/compiler/testData/checkerWithErrorTypes/full/regression/WrongTraceInCallResolver.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/WrongTraceInCallResolver.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/WrongTraceInCallResolver.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/kt251.jet b/compiler/testData/checkerWithErrorTypes/full/regression/kt251.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/kt251.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/kt251.jet diff --git a/idea/testData/checkerWithErrorTypes/full/regression/kt303.jet b/compiler/testData/checkerWithErrorTypes/full/regression/kt303.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/full/regression/kt303.jet rename to compiler/testData/checkerWithErrorTypes/full/regression/kt303.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/AutoCreatedIt.jet b/compiler/testData/checkerWithErrorTypes/quick/AutoCreatedIt.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/AutoCreatedIt.jet rename to compiler/testData/checkerWithErrorTypes/quick/AutoCreatedIt.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/AutocastAmbiguitites.jet b/compiler/testData/checkerWithErrorTypes/quick/AutocastAmbiguitites.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/AutocastAmbiguitites.jet rename to compiler/testData/checkerWithErrorTypes/quick/AutocastAmbiguitites.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet b/compiler/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet rename to compiler/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/Basic.jet b/compiler/testData/checkerWithErrorTypes/quick/Basic.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/Basic.jet rename to compiler/testData/checkerWithErrorTypes/quick/Basic.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/DefaultValuesTypechecking.jet b/compiler/testData/checkerWithErrorTypes/quick/DefaultValuesTypechecking.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/DefaultValuesTypechecking.jet rename to compiler/testData/checkerWithErrorTypes/quick/DefaultValuesTypechecking.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/DeferredTypes.jet b/compiler/testData/checkerWithErrorTypes/quick/DeferredTypes.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/DeferredTypes.jet rename to compiler/testData/checkerWithErrorTypes/quick/DeferredTypes.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/DelegationAndOverriding.jet b/compiler/testData/checkerWithErrorTypes/quick/DelegationAndOverriding.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/DelegationAndOverriding.jet rename to compiler/testData/checkerWithErrorTypes/quick/DelegationAndOverriding.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/DelegationNotTotrait.jet b/compiler/testData/checkerWithErrorTypes/quick/DelegationNotTotrait.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/DelegationNotTotrait.jet rename to compiler/testData/checkerWithErrorTypes/quick/DelegationNotTotrait.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/NamedArgumentsAndDefaultValues.jet b/compiler/testData/checkerWithErrorTypes/quick/NamedArgumentsAndDefaultValues.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/NamedArgumentsAndDefaultValues.jet rename to compiler/testData/checkerWithErrorTypes/quick/NamedArgumentsAndDefaultValues.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/Override.jet b/compiler/testData/checkerWithErrorTypes/quick/Override.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/Override.jet rename to compiler/testData/checkerWithErrorTypes/quick/Override.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet b/compiler/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet rename to compiler/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/Varargs.jet b/compiler/testData/checkerWithErrorTypes/quick/Varargs.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/Varargs.jet rename to compiler/testData/checkerWithErrorTypes/quick/Varargs.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/InfixCallNullability.jet b/compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/InfixCallNullability.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/InfixCallNullability.jet rename to compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/InfixCallNullability.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet b/compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet rename to compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet b/compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet rename to compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/ReceiverNullability.jet b/compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/ReceiverNullability.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/ReceiverNullability.jet rename to compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/ReceiverNullability.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/kt362.jet b/compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/kt362.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/kt362.jet rename to compiler/testData/checkerWithErrorTypes/quick/nullabilityAndAutoCasts/kt362.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/regressions/kt306.jet b/compiler/testData/checkerWithErrorTypes/quick/regressions/kt306.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/regressions/kt306.jet rename to compiler/testData/checkerWithErrorTypes/quick/regressions/kt306.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/regressions/kt307.jet b/compiler/testData/checkerWithErrorTypes/quick/regressions/kt307.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/regressions/kt307.jet rename to compiler/testData/checkerWithErrorTypes/quick/regressions/kt307.jet diff --git a/idea/testData/checkerWithErrorTypes/quick/regressions/kt316.jet b/compiler/testData/checkerWithErrorTypes/quick/regressions/kt316.jet similarity index 100% rename from idea/testData/checkerWithErrorTypes/quick/regressions/kt316.jet rename to compiler/testData/checkerWithErrorTypes/quick/regressions/kt316.jet diff --git a/idea/testData/codegen/PSVM.jet b/compiler/testData/codegen/PSVM.jet similarity index 100% rename from idea/testData/codegen/PSVM.jet rename to compiler/testData/codegen/PSVM.jet diff --git a/idea/testData/codegen/assign.jet b/compiler/testData/codegen/assign.jet similarity index 100% rename from idea/testData/codegen/assign.jet rename to compiler/testData/codegen/assign.jet diff --git a/idea/testData/codegen/bottles.jet b/compiler/testData/codegen/bottles.jet similarity index 100% rename from idea/testData/codegen/bottles.jet rename to compiler/testData/codegen/bottles.jet diff --git a/idea/testData/codegen/bottles2.jet b/compiler/testData/codegen/bottles2.jet similarity index 100% rename from idea/testData/codegen/bottles2.jet rename to compiler/testData/codegen/bottles2.jet diff --git a/idea/testData/codegen/bridge.jet b/compiler/testData/codegen/bridge.jet similarity index 100% rename from idea/testData/codegen/bridge.jet rename to compiler/testData/codegen/bridge.jet diff --git a/idea/testData/codegen/checkCast.jet b/compiler/testData/codegen/checkCast.jet similarity index 100% rename from idea/testData/codegen/checkCast.jet rename to compiler/testData/codegen/checkCast.jet diff --git a/idea/testData/codegen/classes/classObject.jet b/compiler/testData/codegen/classes/classObject.jet similarity index 100% rename from idea/testData/codegen/classes/classObject.jet rename to compiler/testData/codegen/classes/classObject.jet diff --git a/idea/testData/codegen/classes/classObjectInterface.jet b/compiler/testData/codegen/classes/classObjectInterface.jet similarity index 100% rename from idea/testData/codegen/classes/classObjectInterface.jet rename to compiler/testData/codegen/classes/classObjectInterface.jet diff --git a/idea/testData/codegen/classes/classObjectMethod.jet b/compiler/testData/codegen/classes/classObjectMethod.jet similarity index 100% rename from idea/testData/codegen/classes/classObjectMethod.jet rename to compiler/testData/codegen/classes/classObjectMethod.jet diff --git a/idea/testData/codegen/classes/closureWithParameter.jet b/compiler/testData/codegen/classes/closureWithParameter.jet similarity index 100% rename from idea/testData/codegen/classes/closureWithParameter.jet rename to compiler/testData/codegen/classes/closureWithParameter.jet diff --git a/idea/testData/codegen/classes/closureWithParameterAndBoxing.jet b/compiler/testData/codegen/classes/closureWithParameterAndBoxing.jet similarity index 100% rename from idea/testData/codegen/classes/closureWithParameterAndBoxing.jet rename to compiler/testData/codegen/classes/closureWithParameterAndBoxing.jet diff --git a/idea/testData/codegen/classes/diamondInheritance.jet b/compiler/testData/codegen/classes/diamondInheritance.jet similarity index 100% rename from idea/testData/codegen/classes/diamondInheritance.jet rename to compiler/testData/codegen/classes/diamondInheritance.jet diff --git a/idea/testData/codegen/classes/doubleEnclosedLocalVariable.jet b/compiler/testData/codegen/classes/doubleEnclosedLocalVariable.jet similarity index 100% rename from idea/testData/codegen/classes/doubleEnclosedLocalVariable.jet rename to compiler/testData/codegen/classes/doubleEnclosedLocalVariable.jet diff --git a/idea/testData/codegen/classes/enclosingLocalVariable.jet b/compiler/testData/codegen/classes/enclosingLocalVariable.jet similarity index 100% rename from idea/testData/codegen/classes/enclosingLocalVariable.jet rename to compiler/testData/codegen/classes/enclosingLocalVariable.jet diff --git a/idea/testData/codegen/classes/enclosingThis.jet b/compiler/testData/codegen/classes/enclosingThis.jet similarity index 100% rename from idea/testData/codegen/classes/enclosingThis.jet rename to compiler/testData/codegen/classes/enclosingThis.jet diff --git a/idea/testData/codegen/classes/exceptionConstructor.jet b/compiler/testData/codegen/classes/exceptionConstructor.jet similarity index 100% rename from idea/testData/codegen/classes/exceptionConstructor.jet rename to compiler/testData/codegen/classes/exceptionConstructor.jet diff --git a/idea/testData/codegen/classes/extensionClosure.jet b/compiler/testData/codegen/classes/extensionClosure.jet similarity index 100% rename from idea/testData/codegen/classes/extensionClosure.jet rename to compiler/testData/codegen/classes/extensionClosure.jet diff --git a/idea/testData/codegen/classes/funDelegation.jet b/compiler/testData/codegen/classes/funDelegation.jet similarity index 100% rename from idea/testData/codegen/classes/funDelegation.jet rename to compiler/testData/codegen/classes/funDelegation.jet diff --git a/idea/testData/codegen/classes/inheritance.jet b/compiler/testData/codegen/classes/inheritance.jet similarity index 100% rename from idea/testData/codegen/classes/inheritance.jet rename to compiler/testData/codegen/classes/inheritance.jet diff --git a/idea/testData/codegen/classes/inheritedInnerClass.jet b/compiler/testData/codegen/classes/inheritedInnerClass.jet similarity index 100% rename from idea/testData/codegen/classes/inheritedInnerClass.jet rename to compiler/testData/codegen/classes/inheritedInnerClass.jet diff --git a/idea/testData/codegen/classes/inheritedMethod.jet b/compiler/testData/codegen/classes/inheritedMethod.jet similarity index 100% rename from idea/testData/codegen/classes/inheritedMethod.jet rename to compiler/testData/codegen/classes/inheritedMethod.jet diff --git a/idea/testData/codegen/classes/inheritingFromArrayList.jet b/compiler/testData/codegen/classes/inheritingFromArrayList.jet similarity index 100% rename from idea/testData/codegen/classes/inheritingFromArrayList.jet rename to compiler/testData/codegen/classes/inheritingFromArrayList.jet diff --git a/idea/testData/codegen/classes/initializerBlock.jet b/compiler/testData/codegen/classes/initializerBlock.jet similarity index 100% rename from idea/testData/codegen/classes/initializerBlock.jet rename to compiler/testData/codegen/classes/initializerBlock.jet diff --git a/idea/testData/codegen/classes/initializerBlockDImpl.jet b/compiler/testData/codegen/classes/initializerBlockDImpl.jet similarity index 100% rename from idea/testData/codegen/classes/initializerBlockDImpl.jet rename to compiler/testData/codegen/classes/initializerBlockDImpl.jet diff --git a/idea/testData/codegen/classes/innerClass.jet b/compiler/testData/codegen/classes/innerClass.jet similarity index 100% rename from idea/testData/codegen/classes/innerClass.jet rename to compiler/testData/codegen/classes/innerClass.jet diff --git a/idea/testData/codegen/classes/newInstanceDefaultConstructor.jet b/compiler/testData/codegen/classes/newInstanceDefaultConstructor.jet similarity index 100% rename from idea/testData/codegen/classes/newInstanceDefaultConstructor.jet rename to compiler/testData/codegen/classes/newInstanceDefaultConstructor.jet diff --git a/idea/testData/codegen/classes/outerThis.jet b/compiler/testData/codegen/classes/outerThis.jet similarity index 100% rename from idea/testData/codegen/classes/outerThis.jet rename to compiler/testData/codegen/classes/outerThis.jet diff --git a/idea/testData/codegen/classes/overloadBinaryOperator.jet b/compiler/testData/codegen/classes/overloadBinaryOperator.jet similarity index 100% rename from idea/testData/codegen/classes/overloadBinaryOperator.jet rename to compiler/testData/codegen/classes/overloadBinaryOperator.jet diff --git a/idea/testData/codegen/classes/overloadPlusAssign.jet b/compiler/testData/codegen/classes/overloadPlusAssign.jet similarity index 100% rename from idea/testData/codegen/classes/overloadPlusAssign.jet rename to compiler/testData/codegen/classes/overloadPlusAssign.jet diff --git a/idea/testData/codegen/classes/overloadPlusAssignReturn.jet b/compiler/testData/codegen/classes/overloadPlusAssignReturn.jet similarity index 100% rename from idea/testData/codegen/classes/overloadPlusAssignReturn.jet rename to compiler/testData/codegen/classes/overloadPlusAssignReturn.jet diff --git a/idea/testData/codegen/classes/overloadPlusToPlusAssign.jet b/compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet similarity index 100% rename from idea/testData/codegen/classes/overloadPlusToPlusAssign.jet rename to compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet diff --git a/idea/testData/codegen/classes/overloadUnaryOperator.jet b/compiler/testData/codegen/classes/overloadUnaryOperator.jet similarity index 100% rename from idea/testData/codegen/classes/overloadUnaryOperator.jet rename to compiler/testData/codegen/classes/overloadUnaryOperator.jet diff --git a/idea/testData/codegen/classes/propertyDelegation.jet b/compiler/testData/codegen/classes/propertyDelegation.jet similarity index 100% rename from idea/testData/codegen/classes/propertyDelegation.jet rename to compiler/testData/codegen/classes/propertyDelegation.jet diff --git a/idea/testData/codegen/classes/propertyInInitializer.jet b/compiler/testData/codegen/classes/propertyInInitializer.jet similarity index 100% rename from idea/testData/codegen/classes/propertyInInitializer.jet rename to compiler/testData/codegen/classes/propertyInInitializer.jet diff --git a/idea/testData/codegen/classes/rightHandOverride.jet b/compiler/testData/codegen/classes/rightHandOverride.jet similarity index 100% rename from idea/testData/codegen/classes/rightHandOverride.jet rename to compiler/testData/codegen/classes/rightHandOverride.jet diff --git a/idea/testData/codegen/classes/secondaryConstructors.jet b/compiler/testData/codegen/classes/secondaryConstructors.jet similarity index 100% rename from idea/testData/codegen/classes/secondaryConstructors.jet rename to compiler/testData/codegen/classes/secondaryConstructors.jet diff --git a/idea/testData/codegen/classes/simpleBox.jet b/compiler/testData/codegen/classes/simpleBox.jet similarity index 100% rename from idea/testData/codegen/classes/simpleBox.jet rename to compiler/testData/codegen/classes/simpleBox.jet diff --git a/idea/testData/codegen/classes/simpleClass.jet b/compiler/testData/codegen/classes/simpleClass.jet similarity index 100% rename from idea/testData/codegen/classes/simpleClass.jet rename to compiler/testData/codegen/classes/simpleClass.jet diff --git a/idea/testData/codegen/classes/simplestClosure.jet b/compiler/testData/codegen/classes/simplestClosure.jet similarity index 100% rename from idea/testData/codegen/classes/simplestClosure.jet rename to compiler/testData/codegen/classes/simplestClosure.jet diff --git a/idea/testData/codegen/classes/simplestClosureAndBoxing.jet b/compiler/testData/codegen/classes/simplestClosureAndBoxing.jet similarity index 100% rename from idea/testData/codegen/classes/simplestClosureAndBoxing.jet rename to compiler/testData/codegen/classes/simplestClosureAndBoxing.jet diff --git a/idea/testData/codegen/controlStructures/break.jet b/compiler/testData/codegen/controlStructures/break.jet similarity index 100% rename from idea/testData/codegen/controlStructures/break.jet rename to compiler/testData/codegen/controlStructures/break.jet diff --git a/idea/testData/codegen/controlStructures/continue.jet b/compiler/testData/codegen/controlStructures/continue.jet similarity index 100% rename from idea/testData/codegen/controlStructures/continue.jet rename to compiler/testData/codegen/controlStructures/continue.jet diff --git a/idea/testData/codegen/controlStructures/doWhile.jet b/compiler/testData/codegen/controlStructures/doWhile.jet similarity index 100% rename from idea/testData/codegen/controlStructures/doWhile.jet rename to compiler/testData/codegen/controlStructures/doWhile.jet diff --git a/idea/testData/codegen/controlStructures/for.jet b/compiler/testData/codegen/controlStructures/for.jet similarity index 100% rename from idea/testData/codegen/controlStructures/for.jet rename to compiler/testData/codegen/controlStructures/for.jet diff --git a/idea/testData/codegen/controlStructures/forInArray.jet b/compiler/testData/codegen/controlStructures/forInArray.jet similarity index 100% rename from idea/testData/codegen/controlStructures/forInArray.jet rename to compiler/testData/codegen/controlStructures/forInArray.jet diff --git a/idea/testData/codegen/controlStructures/forIntArray.jet b/compiler/testData/codegen/controlStructures/forIntArray.jet similarity index 100% rename from idea/testData/codegen/controlStructures/forIntArray.jet rename to compiler/testData/codegen/controlStructures/forIntArray.jet diff --git a/idea/testData/codegen/controlStructures/forIntRange.jet b/compiler/testData/codegen/controlStructures/forIntRange.jet similarity index 100% rename from idea/testData/codegen/controlStructures/forIntRange.jet rename to compiler/testData/codegen/controlStructures/forIntRange.jet diff --git a/idea/testData/codegen/controlStructures/forNullableIntArray.jet b/compiler/testData/codegen/controlStructures/forNullableIntArray.jet similarity index 100% rename from idea/testData/codegen/controlStructures/forNullableIntArray.jet rename to compiler/testData/codegen/controlStructures/forNullableIntArray.jet diff --git a/idea/testData/codegen/controlStructures/forPrimitiveIntArray.jet b/compiler/testData/codegen/controlStructures/forPrimitiveIntArray.jet similarity index 100% rename from idea/testData/codegen/controlStructures/forPrimitiveIntArray.jet rename to compiler/testData/codegen/controlStructures/forPrimitiveIntArray.jet diff --git a/idea/testData/codegen/controlStructures/forUserType.jet b/compiler/testData/codegen/controlStructures/forUserType.jet similarity index 100% rename from idea/testData/codegen/controlStructures/forUserType.jet rename to compiler/testData/codegen/controlStructures/forUserType.jet diff --git a/idea/testData/codegen/controlStructures/if.jet b/compiler/testData/codegen/controlStructures/if.jet similarity index 100% rename from idea/testData/codegen/controlStructures/if.jet rename to compiler/testData/codegen/controlStructures/if.jet diff --git a/idea/testData/codegen/controlStructures/ifBlock.jet b/compiler/testData/codegen/controlStructures/ifBlock.jet similarity index 100% rename from idea/testData/codegen/controlStructures/ifBlock.jet rename to compiler/testData/codegen/controlStructures/ifBlock.jet diff --git a/idea/testData/codegen/controlStructures/ifNoElse.jet b/compiler/testData/codegen/controlStructures/ifNoElse.jet similarity index 100% rename from idea/testData/codegen/controlStructures/ifNoElse.jet rename to compiler/testData/codegen/controlStructures/ifNoElse.jet diff --git a/idea/testData/codegen/controlStructures/singleBranchIf.jet b/compiler/testData/codegen/controlStructures/singleBranchIf.jet similarity index 100% rename from idea/testData/codegen/controlStructures/singleBranchIf.jet rename to compiler/testData/codegen/controlStructures/singleBranchIf.jet diff --git a/idea/testData/codegen/controlStructures/tryCatch.jet b/compiler/testData/codegen/controlStructures/tryCatch.jet similarity index 100% rename from idea/testData/codegen/controlStructures/tryCatch.jet rename to compiler/testData/codegen/controlStructures/tryCatch.jet diff --git a/idea/testData/codegen/controlStructures/tryFinally.jet b/compiler/testData/codegen/controlStructures/tryFinally.jet similarity index 100% rename from idea/testData/codegen/controlStructures/tryFinally.jet rename to compiler/testData/codegen/controlStructures/tryFinally.jet diff --git a/idea/testData/codegen/controlStructures/while.jet b/compiler/testData/codegen/controlStructures/while.jet similarity index 100% rename from idea/testData/codegen/controlStructures/while.jet rename to compiler/testData/codegen/controlStructures/while.jet diff --git a/idea/testData/codegen/extensionFunctions/generic.jet b/compiler/testData/codegen/extensionFunctions/generic.jet similarity index 100% rename from idea/testData/codegen/extensionFunctions/generic.jet rename to compiler/testData/codegen/extensionFunctions/generic.jet diff --git a/idea/testData/codegen/extensionFunctions/simple.jet b/compiler/testData/codegen/extensionFunctions/simple.jet similarity index 100% rename from idea/testData/codegen/extensionFunctions/simple.jet rename to compiler/testData/codegen/extensionFunctions/simple.jet diff --git a/idea/testData/codegen/extensionFunctions/whenFail.jet b/compiler/testData/codegen/extensionFunctions/whenFail.jet similarity index 100% rename from idea/testData/codegen/extensionFunctions/whenFail.jet rename to compiler/testData/codegen/extensionFunctions/whenFail.jet diff --git a/idea/testData/codegen/functionCall.jet b/compiler/testData/codegen/functionCall.jet similarity index 100% rename from idea/testData/codegen/functionCall.jet rename to compiler/testData/codegen/functionCall.jet diff --git a/idea/testData/codegen/functions/defaultargs.jet b/compiler/testData/codegen/functions/defaultargs.jet similarity index 100% rename from idea/testData/codegen/functions/defaultargs.jet rename to compiler/testData/codegen/functions/defaultargs.jet diff --git a/idea/testData/codegen/functions/namedargs.jet b/compiler/testData/codegen/functions/namedargs.jet similarity index 100% rename from idea/testData/codegen/functions/namedargs.jet rename to compiler/testData/codegen/functions/namedargs.jet diff --git a/idea/testData/codegen/functions/nothisnoclosure.jet b/compiler/testData/codegen/functions/nothisnoclosure.jet similarity index 100% rename from idea/testData/codegen/functions/nothisnoclosure.jet rename to compiler/testData/codegen/functions/nothisnoclosure.jet diff --git a/idea/testData/codegen/helloWorld.jet b/compiler/testData/codegen/helloWorld.jet similarity index 100% rename from idea/testData/codegen/helloWorld.jet rename to compiler/testData/codegen/helloWorld.jet diff --git a/idea/testData/codegen/incrementProperty.jet b/compiler/testData/codegen/incrementProperty.jet similarity index 100% rename from idea/testData/codegen/incrementProperty.jet rename to compiler/testData/codegen/incrementProperty.jet diff --git a/idea/testData/codegen/localProperty.jet b/compiler/testData/codegen/localProperty.jet similarity index 100% rename from idea/testData/codegen/localProperty.jet rename to compiler/testData/codegen/localProperty.jet diff --git a/idea/testData/codegen/namespaceQualifiedMethod.jet b/compiler/testData/codegen/namespaceQualifiedMethod.jet similarity index 100% rename from idea/testData/codegen/namespaceQualifiedMethod.jet rename to compiler/testData/codegen/namespaceQualifiedMethod.jet diff --git a/idea/testData/codegen/newInstanceExplicitConstructor.jet b/compiler/testData/codegen/newInstanceExplicitConstructor.jet similarity index 100% rename from idea/testData/codegen/newInstanceExplicitConstructor.jet rename to compiler/testData/codegen/newInstanceExplicitConstructor.jet diff --git a/idea/testData/codegen/objects/methodOnObject.jet b/compiler/testData/codegen/objects/methodOnObject.jet similarity index 100% rename from idea/testData/codegen/objects/methodOnObject.jet rename to compiler/testData/codegen/objects/methodOnObject.jet diff --git a/idea/testData/codegen/objects/objectLiteral.jet b/compiler/testData/codegen/objects/objectLiteral.jet similarity index 100% rename from idea/testData/codegen/objects/objectLiteral.jet rename to compiler/testData/codegen/objects/objectLiteral.jet diff --git a/idea/testData/codegen/objects/simpleObject.jet b/compiler/testData/codegen/objects/simpleObject.jet similarity index 100% rename from idea/testData/codegen/objects/simpleObject.jet rename to compiler/testData/codegen/objects/simpleObject.jet diff --git a/idea/testData/codegen/patternMatching/callProperty.jet b/compiler/testData/codegen/patternMatching/callProperty.jet similarity index 100% rename from idea/testData/codegen/patternMatching/callProperty.jet rename to compiler/testData/codegen/patternMatching/callProperty.jet diff --git a/idea/testData/codegen/patternMatching/constant.jet b/compiler/testData/codegen/patternMatching/constant.jet similarity index 100% rename from idea/testData/codegen/patternMatching/constant.jet rename to compiler/testData/codegen/patternMatching/constant.jet diff --git a/idea/testData/codegen/patternMatching/exceptionOnNoMatch.jet b/compiler/testData/codegen/patternMatching/exceptionOnNoMatch.jet similarity index 100% rename from idea/testData/codegen/patternMatching/exceptionOnNoMatch.jet rename to compiler/testData/codegen/patternMatching/exceptionOnNoMatch.jet diff --git a/idea/testData/codegen/patternMatching/inrange.jet b/compiler/testData/codegen/patternMatching/inrange.jet similarity index 100% rename from idea/testData/codegen/patternMatching/inrange.jet rename to compiler/testData/codegen/patternMatching/inrange.jet diff --git a/idea/testData/codegen/patternMatching/is.jet b/compiler/testData/codegen/patternMatching/is.jet similarity index 100% rename from idea/testData/codegen/patternMatching/is.jet rename to compiler/testData/codegen/patternMatching/is.jet diff --git a/idea/testData/codegen/patternMatching/pattern.jet b/compiler/testData/codegen/patternMatching/pattern.jet similarity index 100% rename from idea/testData/codegen/patternMatching/pattern.jet rename to compiler/testData/codegen/patternMatching/pattern.jet diff --git a/idea/testData/codegen/patternMatching/range.jet b/compiler/testData/codegen/patternMatching/range.jet similarity index 100% rename from idea/testData/codegen/patternMatching/range.jet rename to compiler/testData/codegen/patternMatching/range.jet diff --git a/idea/testData/codegen/patternMatching/rangeChar.jet b/compiler/testData/codegen/patternMatching/rangeChar.jet similarity index 100% rename from idea/testData/codegen/patternMatching/rangeChar.jet rename to compiler/testData/codegen/patternMatching/rangeChar.jet diff --git a/idea/testData/codegen/properties/fieldPropertyAccess.jet b/compiler/testData/codegen/properties/fieldPropertyAccess.jet similarity index 100% rename from idea/testData/codegen/properties/fieldPropertyAccess.jet rename to compiler/testData/codegen/properties/fieldPropertyAccess.jet diff --git a/idea/testData/codegen/properties/fieldSetter.jet b/compiler/testData/codegen/properties/fieldSetter.jet similarity index 100% rename from idea/testData/codegen/properties/fieldSetter.jet rename to compiler/testData/codegen/properties/fieldSetter.jet diff --git a/idea/testData/codegen/properties/fieldSetterPlusEq.jet b/compiler/testData/codegen/properties/fieldSetterPlusEq.jet similarity index 100% rename from idea/testData/codegen/properties/fieldSetterPlusEq.jet rename to compiler/testData/codegen/properties/fieldSetterPlusEq.jet diff --git a/idea/testData/codegen/properties/privateVal.jet b/compiler/testData/codegen/properties/privateVal.jet similarity index 100% rename from idea/testData/codegen/properties/privateVal.jet rename to compiler/testData/codegen/properties/privateVal.jet diff --git a/idea/testData/codegen/properties/privateVar.jet b/compiler/testData/codegen/properties/privateVar.jet similarity index 100% rename from idea/testData/codegen/properties/privateVar.jet rename to compiler/testData/codegen/properties/privateVar.jet diff --git a/idea/testData/codegen/properties/propertyReceiverOnStack.jet b/compiler/testData/codegen/properties/propertyReceiverOnStack.jet similarity index 100% rename from idea/testData/codegen/properties/propertyReceiverOnStack.jet rename to compiler/testData/codegen/properties/propertyReceiverOnStack.jet diff --git a/idea/testData/codegen/regressions/kt232.jet b/compiler/testData/codegen/regressions/kt232.jet similarity index 100% rename from idea/testData/codegen/regressions/kt232.jet rename to compiler/testData/codegen/regressions/kt232.jet diff --git a/idea/testData/codegen/regressions/kt237.jet b/compiler/testData/codegen/regressions/kt237.jet similarity index 100% rename from idea/testData/codegen/regressions/kt237.jet rename to compiler/testData/codegen/regressions/kt237.jet diff --git a/idea/testData/codegen/regressions/kt238.jet b/compiler/testData/codegen/regressions/kt238.jet similarity index 100% rename from idea/testData/codegen/regressions/kt238.jet rename to compiler/testData/codegen/regressions/kt238.jet diff --git a/idea/testData/codegen/regressions/kt239.jet b/compiler/testData/codegen/regressions/kt239.jet similarity index 100% rename from idea/testData/codegen/regressions/kt239.jet rename to compiler/testData/codegen/regressions/kt239.jet diff --git a/idea/testData/codegen/regressions/kt242.jet b/compiler/testData/codegen/regressions/kt242.jet similarity index 100% rename from idea/testData/codegen/regressions/kt242.jet rename to compiler/testData/codegen/regressions/kt242.jet diff --git a/idea/testData/codegen/regressions/kt243.jet b/compiler/testData/codegen/regressions/kt243.jet similarity index 100% rename from idea/testData/codegen/regressions/kt243.jet rename to compiler/testData/codegen/regressions/kt243.jet diff --git a/idea/testData/codegen/regressions/kt245.jet b/compiler/testData/codegen/regressions/kt245.jet similarity index 100% rename from idea/testData/codegen/regressions/kt245.jet rename to compiler/testData/codegen/regressions/kt245.jet diff --git a/idea/testData/codegen/regressions/kt247.jet b/compiler/testData/codegen/regressions/kt247.jet similarity index 100% rename from idea/testData/codegen/regressions/kt247.jet rename to compiler/testData/codegen/regressions/kt247.jet diff --git a/idea/testData/codegen/regressions/kt248.jet b/compiler/testData/codegen/regressions/kt248.jet similarity index 100% rename from idea/testData/codegen/regressions/kt248.jet rename to compiler/testData/codegen/regressions/kt248.jet diff --git a/idea/testData/codegen/regressions/kt249.jet b/compiler/testData/codegen/regressions/kt249.jet similarity index 100% rename from idea/testData/codegen/regressions/kt249.jet rename to compiler/testData/codegen/regressions/kt249.jet diff --git a/idea/testData/codegen/regressions/kt257.jet b/compiler/testData/codegen/regressions/kt257.jet similarity index 100% rename from idea/testData/codegen/regressions/kt257.jet rename to compiler/testData/codegen/regressions/kt257.jet diff --git a/idea/testData/codegen/regressions/kt259.jet b/compiler/testData/codegen/regressions/kt259.jet similarity index 100% rename from idea/testData/codegen/regressions/kt259.jet rename to compiler/testData/codegen/regressions/kt259.jet diff --git a/idea/testData/codegen/regressions/kt297.jet b/compiler/testData/codegen/regressions/kt297.jet similarity index 100% rename from idea/testData/codegen/regressions/kt297.jet rename to compiler/testData/codegen/regressions/kt297.jet diff --git a/idea/testData/codegen/regressions/kt299.jet b/compiler/testData/codegen/regressions/kt299.jet similarity index 100% rename from idea/testData/codegen/regressions/kt299.jet rename to compiler/testData/codegen/regressions/kt299.jet diff --git a/idea/testData/codegen/regressions/kt326.jet b/compiler/testData/codegen/regressions/kt326.jet similarity index 100% rename from idea/testData/codegen/regressions/kt326.jet rename to compiler/testData/codegen/regressions/kt326.jet diff --git a/idea/testData/codegen/regressions/kt343.jet b/compiler/testData/codegen/regressions/kt343.jet similarity index 100% rename from idea/testData/codegen/regressions/kt343.jet rename to compiler/testData/codegen/regressions/kt343.jet diff --git a/idea/testData/codegen/regressions/kt344.jet b/compiler/testData/codegen/regressions/kt344.jet similarity index 100% rename from idea/testData/codegen/regressions/kt344.jet rename to compiler/testData/codegen/regressions/kt344.jet diff --git a/idea/testData/codegen/regressions/kt48.jet b/compiler/testData/codegen/regressions/kt48.jet similarity index 100% rename from idea/testData/codegen/regressions/kt48.jet rename to compiler/testData/codegen/regressions/kt48.jet diff --git a/idea/testData/codegen/systemOut.jet b/compiler/testData/codegen/systemOut.jet similarity index 100% rename from idea/testData/codegen/systemOut.jet rename to compiler/testData/codegen/systemOut.jet diff --git a/idea/testData/codegen/traits/multiple.jet b/compiler/testData/codegen/traits/multiple.jet similarity index 100% rename from idea/testData/codegen/traits/multiple.jet rename to compiler/testData/codegen/traits/multiple.jet diff --git a/idea/testData/codegen/traits/simple.jet b/compiler/testData/codegen/traits/simple.jet similarity index 100% rename from idea/testData/codegen/traits/simple.jet rename to compiler/testData/codegen/traits/simple.jet diff --git a/idea/testData/codegen/traits/stdlib.jet b/compiler/testData/codegen/traits/stdlib.jet similarity index 100% rename from idea/testData/codegen/traits/stdlib.jet rename to compiler/testData/codegen/traits/stdlib.jet diff --git a/idea/testData/codegen/traits/withRequired.jet b/compiler/testData/codegen/traits/withRequired.jet similarity index 100% rename from idea/testData/codegen/traits/withRequired.jet rename to compiler/testData/codegen/traits/withRequired.jet diff --git a/idea/testData/codegen/typeInfo/asInLoop.jet b/compiler/testData/codegen/typeInfo/asInLoop.jet similarity index 100% rename from idea/testData/codegen/typeInfo/asInLoop.jet rename to compiler/testData/codegen/typeInfo/asInLoop.jet diff --git a/idea/testData/codegen/typeInfo/asSafeWithGenerics.jet b/compiler/testData/codegen/typeInfo/asSafeWithGenerics.jet similarity index 100% rename from idea/testData/codegen/typeInfo/asSafeWithGenerics.jet rename to compiler/testData/codegen/typeInfo/asSafeWithGenerics.jet diff --git a/idea/testData/codegen/typeInfo/classObjectInTypeInfo.jet b/compiler/testData/codegen/typeInfo/classObjectInTypeInfo.jet similarity index 100% rename from idea/testData/codegen/typeInfo/classObjectInTypeInfo.jet rename to compiler/testData/codegen/typeInfo/classObjectInTypeInfo.jet diff --git a/idea/testData/codegen/typeInfo/forwardTypeParameter.jet b/compiler/testData/codegen/typeInfo/forwardTypeParameter.jet similarity index 100% rename from idea/testData/codegen/typeInfo/forwardTypeParameter.jet rename to compiler/testData/codegen/typeInfo/forwardTypeParameter.jet diff --git a/idea/testData/codegen/typeInfo/genericFunction.jet b/compiler/testData/codegen/typeInfo/genericFunction.jet similarity index 100% rename from idea/testData/codegen/typeInfo/genericFunction.jet rename to compiler/testData/codegen/typeInfo/genericFunction.jet diff --git a/idea/testData/codegen/typeInfo/getTypeInfo.jet b/compiler/testData/codegen/typeInfo/getTypeInfo.jet similarity index 100% rename from idea/testData/codegen/typeInfo/getTypeInfo.jet rename to compiler/testData/codegen/typeInfo/getTypeInfo.jet diff --git a/idea/testData/codegen/typeInfo/inner.jet b/compiler/testData/codegen/typeInfo/inner.jet similarity index 100% rename from idea/testData/codegen/typeInfo/inner.jet rename to compiler/testData/codegen/typeInfo/inner.jet diff --git a/idea/testData/codegen/typeInfo/isTypeParameter.jet b/compiler/testData/codegen/typeInfo/isTypeParameter.jet similarity index 100% rename from idea/testData/codegen/typeInfo/isTypeParameter.jet rename to compiler/testData/codegen/typeInfo/isTypeParameter.jet diff --git a/idea/testData/codegen/typeInfo/isWithGenericParameters.jet b/compiler/testData/codegen/typeInfo/isWithGenericParameters.jet similarity index 100% rename from idea/testData/codegen/typeInfo/isWithGenericParameters.jet rename to compiler/testData/codegen/typeInfo/isWithGenericParameters.jet diff --git a/idea/testData/codegen/typeInfo/isWithGenerics.jet b/compiler/testData/codegen/typeInfo/isWithGenerics.jet similarity index 100% rename from idea/testData/codegen/typeInfo/isWithGenerics.jet rename to compiler/testData/codegen/typeInfo/isWithGenerics.jet diff --git a/idea/testData/codegen/typeInfo/nullability.jet b/compiler/testData/codegen/typeInfo/nullability.jet similarity index 100% rename from idea/testData/codegen/typeInfo/nullability.jet rename to compiler/testData/codegen/typeInfo/nullability.jet diff --git a/idea/testData/codegen/typeInfo/oneArgTypeinfo.jet b/compiler/testData/codegen/typeInfo/oneArgTypeinfo.jet similarity index 100% rename from idea/testData/codegen/typeInfo/oneArgTypeinfo.jet rename to compiler/testData/codegen/typeInfo/oneArgTypeinfo.jet diff --git a/idea/testData/codegen/typeInfo/primitiveTypeInfo.jet b/compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet similarity index 100% rename from idea/testData/codegen/typeInfo/primitiveTypeInfo.jet rename to compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet diff --git a/idea/testData/mockJDK-1.7/jre/lib/annotations.jar b/compiler/testData/mockJDK-1.7/jre/lib/annotations.jar similarity index 100% rename from idea/testData/mockJDK-1.7/jre/lib/annotations.jar rename to compiler/testData/mockJDK-1.7/jre/lib/annotations.jar diff --git a/idea/testData/mockJDK-1.7/jre/lib/rt.jar b/compiler/testData/mockJDK-1.7/jre/lib/rt.jar similarity index 100% rename from idea/testData/mockJDK-1.7/jre/lib/rt.jar rename to compiler/testData/mockJDK-1.7/jre/lib/rt.jar diff --git a/idea/testData/mockJDK-1.7/src.zip b/compiler/testData/mockJDK-1.7/src.zip similarity index 100% rename from idea/testData/mockJDK-1.7/src.zip rename to compiler/testData/mockJDK-1.7/src.zip diff --git a/idea/testData/psi/AnnotatedExpressions.jet b/compiler/testData/psi/AnnotatedExpressions.jet similarity index 100% rename from idea/testData/psi/AnnotatedExpressions.jet rename to compiler/testData/psi/AnnotatedExpressions.jet diff --git a/idea/testData/psi/AnnotatedExpressions.txt b/compiler/testData/psi/AnnotatedExpressions.txt similarity index 100% rename from idea/testData/psi/AnnotatedExpressions.txt rename to compiler/testData/psi/AnnotatedExpressions.txt diff --git a/idea/testData/psi/AnonymousInitializer.jet b/compiler/testData/psi/AnonymousInitializer.jet similarity index 100% rename from idea/testData/psi/AnonymousInitializer.jet rename to compiler/testData/psi/AnonymousInitializer.jet diff --git a/idea/testData/psi/AnonymousInitializer.txt b/compiler/testData/psi/AnonymousInitializer.txt similarity index 100% rename from idea/testData/psi/AnonymousInitializer.txt rename to compiler/testData/psi/AnonymousInitializer.txt diff --git a/idea/testData/psi/Attributes.jet b/compiler/testData/psi/Attributes.jet similarity index 100% rename from idea/testData/psi/Attributes.jet rename to compiler/testData/psi/Attributes.jet diff --git a/idea/testData/psi/Attributes.txt b/compiler/testData/psi/Attributes.txt similarity index 100% rename from idea/testData/psi/Attributes.txt rename to compiler/testData/psi/Attributes.txt diff --git a/idea/testData/psi/AttributesOnPatterns.jet b/compiler/testData/psi/AttributesOnPatterns.jet similarity index 100% rename from idea/testData/psi/AttributesOnPatterns.jet rename to compiler/testData/psi/AttributesOnPatterns.jet diff --git a/idea/testData/psi/AttributesOnPatterns.txt b/compiler/testData/psi/AttributesOnPatterns.txt similarity index 100% rename from idea/testData/psi/AttributesOnPatterns.txt rename to compiler/testData/psi/AttributesOnPatterns.txt diff --git a/idea/testData/psi/Attributes_ERR.jet b/compiler/testData/psi/Attributes_ERR.jet similarity index 100% rename from idea/testData/psi/Attributes_ERR.jet rename to compiler/testData/psi/Attributes_ERR.jet diff --git a/idea/testData/psi/Attributes_ERR.txt b/compiler/testData/psi/Attributes_ERR.txt similarity index 100% rename from idea/testData/psi/Attributes_ERR.txt rename to compiler/testData/psi/Attributes_ERR.txt diff --git a/idea/testData/psi/BabySteps.jet b/compiler/testData/psi/BabySteps.jet similarity index 100% rename from idea/testData/psi/BabySteps.jet rename to compiler/testData/psi/BabySteps.jet diff --git a/idea/testData/psi/BabySteps.txt b/compiler/testData/psi/BabySteps.txt similarity index 100% rename from idea/testData/psi/BabySteps.txt rename to compiler/testData/psi/BabySteps.txt diff --git a/idea/testData/psi/BabySteps_ERR.jet b/compiler/testData/psi/BabySteps_ERR.jet similarity index 100% rename from idea/testData/psi/BabySteps_ERR.jet rename to compiler/testData/psi/BabySteps_ERR.jet diff --git a/idea/testData/psi/BabySteps_ERR.txt b/compiler/testData/psi/BabySteps_ERR.txt similarity index 100% rename from idea/testData/psi/BabySteps_ERR.txt rename to compiler/testData/psi/BabySteps_ERR.txt diff --git a/idea/testData/psi/ByCaluses.jet b/compiler/testData/psi/ByCaluses.jet similarity index 100% rename from idea/testData/psi/ByCaluses.jet rename to compiler/testData/psi/ByCaluses.jet diff --git a/idea/testData/psi/ByCaluses.txt b/compiler/testData/psi/ByCaluses.txt similarity index 100% rename from idea/testData/psi/ByCaluses.txt rename to compiler/testData/psi/ByCaluses.txt diff --git a/idea/testData/psi/CallWithManyClosures.jet b/compiler/testData/psi/CallWithManyClosures.jet similarity index 100% rename from idea/testData/psi/CallWithManyClosures.jet rename to compiler/testData/psi/CallWithManyClosures.jet diff --git a/idea/testData/psi/CallWithManyClosures.txt b/compiler/testData/psi/CallWithManyClosures.txt similarity index 100% rename from idea/testData/psi/CallWithManyClosures.txt rename to compiler/testData/psi/CallWithManyClosures.txt diff --git a/idea/testData/psi/CallsInWhen.jet b/compiler/testData/psi/CallsInWhen.jet similarity index 100% rename from idea/testData/psi/CallsInWhen.jet rename to compiler/testData/psi/CallsInWhen.jet diff --git a/idea/testData/psi/CallsInWhen.txt b/compiler/testData/psi/CallsInWhen.txt similarity index 100% rename from idea/testData/psi/CallsInWhen.txt rename to compiler/testData/psi/CallsInWhen.txt diff --git a/idea/testData/psi/Constructors.jet b/compiler/testData/psi/Constructors.jet similarity index 100% rename from idea/testData/psi/Constructors.jet rename to compiler/testData/psi/Constructors.jet diff --git a/idea/testData/psi/Constructors.txt b/compiler/testData/psi/Constructors.txt similarity index 100% rename from idea/testData/psi/Constructors.txt rename to compiler/testData/psi/Constructors.txt diff --git a/idea/testData/psi/ControlStructures.jet b/compiler/testData/psi/ControlStructures.jet similarity index 100% rename from idea/testData/psi/ControlStructures.jet rename to compiler/testData/psi/ControlStructures.jet diff --git a/idea/testData/psi/ControlStructures.txt b/compiler/testData/psi/ControlStructures.txt similarity index 100% rename from idea/testData/psi/ControlStructures.txt rename to compiler/testData/psi/ControlStructures.txt diff --git a/idea/testData/psi/EOLsInComments.jet b/compiler/testData/psi/EOLsInComments.jet similarity index 100% rename from idea/testData/psi/EOLsInComments.jet rename to compiler/testData/psi/EOLsInComments.jet diff --git a/idea/testData/psi/EOLsInComments.txt b/compiler/testData/psi/EOLsInComments.txt similarity index 100% rename from idea/testData/psi/EOLsInComments.txt rename to compiler/testData/psi/EOLsInComments.txt diff --git a/idea/testData/psi/EOLsOnRollback.jet b/compiler/testData/psi/EOLsOnRollback.jet similarity index 100% rename from idea/testData/psi/EOLsOnRollback.jet rename to compiler/testData/psi/EOLsOnRollback.jet diff --git a/idea/testData/psi/EOLsOnRollback.txt b/compiler/testData/psi/EOLsOnRollback.txt similarity index 100% rename from idea/testData/psi/EOLsOnRollback.txt rename to compiler/testData/psi/EOLsOnRollback.txt diff --git a/idea/testData/psi/EmptyFile.jet b/compiler/testData/psi/EmptyFile.jet similarity index 100% rename from idea/testData/psi/EmptyFile.jet rename to compiler/testData/psi/EmptyFile.jet diff --git a/idea/testData/psi/EmptyFile.txt b/compiler/testData/psi/EmptyFile.txt similarity index 100% rename from idea/testData/psi/EmptyFile.txt rename to compiler/testData/psi/EmptyFile.txt diff --git a/idea/testData/psi/Enums.jet b/compiler/testData/psi/Enums.jet similarity index 100% rename from idea/testData/psi/Enums.jet rename to compiler/testData/psi/Enums.jet diff --git a/idea/testData/psi/Enums.txt b/compiler/testData/psi/Enums.txt similarity index 100% rename from idea/testData/psi/Enums.txt rename to compiler/testData/psi/Enums.txt diff --git a/idea/testData/psi/Expressions_ERR.jet b/compiler/testData/psi/Expressions_ERR.jet similarity index 100% rename from idea/testData/psi/Expressions_ERR.jet rename to compiler/testData/psi/Expressions_ERR.jet diff --git a/idea/testData/psi/Expressions_ERR.txt b/compiler/testData/psi/Expressions_ERR.txt similarity index 100% rename from idea/testData/psi/Expressions_ERR.txt rename to compiler/testData/psi/Expressions_ERR.txt diff --git a/idea/testData/psi/FileStart_ERR.jet b/compiler/testData/psi/FileStart_ERR.jet similarity index 100% rename from idea/testData/psi/FileStart_ERR.jet rename to compiler/testData/psi/FileStart_ERR.jet diff --git a/idea/testData/psi/FileStart_ERR.txt b/compiler/testData/psi/FileStart_ERR.txt similarity index 100% rename from idea/testData/psi/FileStart_ERR.txt rename to compiler/testData/psi/FileStart_ERR.txt diff --git a/idea/testData/psi/FunctionCalls.jet b/compiler/testData/psi/FunctionCalls.jet similarity index 100% rename from idea/testData/psi/FunctionCalls.jet rename to compiler/testData/psi/FunctionCalls.jet diff --git a/idea/testData/psi/FunctionCalls.txt b/compiler/testData/psi/FunctionCalls.txt similarity index 100% rename from idea/testData/psi/FunctionCalls.txt rename to compiler/testData/psi/FunctionCalls.txt diff --git a/idea/testData/psi/FunctionLiterals.jet b/compiler/testData/psi/FunctionLiterals.jet similarity index 100% rename from idea/testData/psi/FunctionLiterals.jet rename to compiler/testData/psi/FunctionLiterals.jet diff --git a/idea/testData/psi/FunctionLiterals.txt b/compiler/testData/psi/FunctionLiterals.txt similarity index 100% rename from idea/testData/psi/FunctionLiterals.txt rename to compiler/testData/psi/FunctionLiterals.txt diff --git a/idea/testData/psi/FunctionLiterals_ERR.jet b/compiler/testData/psi/FunctionLiterals_ERR.jet similarity index 100% rename from idea/testData/psi/FunctionLiterals_ERR.jet rename to compiler/testData/psi/FunctionLiterals_ERR.jet diff --git a/idea/testData/psi/FunctionLiterals_ERR.txt b/compiler/testData/psi/FunctionLiterals_ERR.txt similarity index 100% rename from idea/testData/psi/FunctionLiterals_ERR.txt rename to compiler/testData/psi/FunctionLiterals_ERR.txt diff --git a/idea/testData/psi/FunctionTypes.jet b/compiler/testData/psi/FunctionTypes.jet similarity index 100% rename from idea/testData/psi/FunctionTypes.jet rename to compiler/testData/psi/FunctionTypes.jet diff --git a/idea/testData/psi/FunctionTypes.txt b/compiler/testData/psi/FunctionTypes.txt similarity index 100% rename from idea/testData/psi/FunctionTypes.txt rename to compiler/testData/psi/FunctionTypes.txt diff --git a/idea/testData/psi/FunctionTypes_ERR.jet b/compiler/testData/psi/FunctionTypes_ERR.jet similarity index 100% rename from idea/testData/psi/FunctionTypes_ERR.jet rename to compiler/testData/psi/FunctionTypes_ERR.jet diff --git a/idea/testData/psi/FunctionTypes_ERR.txt b/compiler/testData/psi/FunctionTypes_ERR.txt similarity index 100% rename from idea/testData/psi/FunctionTypes_ERR.txt rename to compiler/testData/psi/FunctionTypes_ERR.txt diff --git a/idea/testData/psi/Functions.jet b/compiler/testData/psi/Functions.jet similarity index 100% rename from idea/testData/psi/Functions.jet rename to compiler/testData/psi/Functions.jet diff --git a/idea/testData/psi/Functions.txt b/compiler/testData/psi/Functions.txt similarity index 100% rename from idea/testData/psi/Functions.txt rename to compiler/testData/psi/Functions.txt diff --git a/idea/testData/psi/Functions_ERR.jet b/compiler/testData/psi/Functions_ERR.jet similarity index 100% rename from idea/testData/psi/Functions_ERR.jet rename to compiler/testData/psi/Functions_ERR.jet diff --git a/idea/testData/psi/Functions_ERR.txt b/compiler/testData/psi/Functions_ERR.txt similarity index 100% rename from idea/testData/psi/Functions_ERR.txt rename to compiler/testData/psi/Functions_ERR.txt diff --git a/idea/testData/psi/HangOnLonelyModifier.jet b/compiler/testData/psi/HangOnLonelyModifier.jet similarity index 100% rename from idea/testData/psi/HangOnLonelyModifier.jet rename to compiler/testData/psi/HangOnLonelyModifier.jet diff --git a/idea/testData/psi/HangOnLonelyModifier.txt b/compiler/testData/psi/HangOnLonelyModifier.txt similarity index 100% rename from idea/testData/psi/HangOnLonelyModifier.txt rename to compiler/testData/psi/HangOnLonelyModifier.txt diff --git a/idea/testData/psi/IfWithPropery.jet b/compiler/testData/psi/IfWithPropery.jet similarity index 100% rename from idea/testData/psi/IfWithPropery.jet rename to compiler/testData/psi/IfWithPropery.jet diff --git a/idea/testData/psi/IfWithPropery.txt b/compiler/testData/psi/IfWithPropery.txt similarity index 100% rename from idea/testData/psi/IfWithPropery.txt rename to compiler/testData/psi/IfWithPropery.txt diff --git a/idea/testData/psi/ImportSoftKW.jet b/compiler/testData/psi/ImportSoftKW.jet similarity index 100% rename from idea/testData/psi/ImportSoftKW.jet rename to compiler/testData/psi/ImportSoftKW.jet diff --git a/idea/testData/psi/ImportSoftKW.txt b/compiler/testData/psi/ImportSoftKW.txt similarity index 100% rename from idea/testData/psi/ImportSoftKW.txt rename to compiler/testData/psi/ImportSoftKW.txt diff --git a/idea/testData/psi/Imports.jet b/compiler/testData/psi/Imports.jet similarity index 100% rename from idea/testData/psi/Imports.jet rename to compiler/testData/psi/Imports.jet diff --git a/idea/testData/psi/Imports.txt b/compiler/testData/psi/Imports.txt similarity index 100% rename from idea/testData/psi/Imports.txt rename to compiler/testData/psi/Imports.txt diff --git a/idea/testData/psi/Imports_ERR.jet b/compiler/testData/psi/Imports_ERR.jet similarity index 100% rename from idea/testData/psi/Imports_ERR.jet rename to compiler/testData/psi/Imports_ERR.jet diff --git a/idea/testData/psi/Imports_ERR.txt b/compiler/testData/psi/Imports_ERR.txt similarity index 100% rename from idea/testData/psi/Imports_ERR.txt rename to compiler/testData/psi/Imports_ERR.txt diff --git a/idea/testData/psi/Labels.jet b/compiler/testData/psi/Labels.jet similarity index 100% rename from idea/testData/psi/Labels.jet rename to compiler/testData/psi/Labels.jet diff --git a/idea/testData/psi/Labels.txt b/compiler/testData/psi/Labels.txt similarity index 100% rename from idea/testData/psi/Labels.txt rename to compiler/testData/psi/Labels.txt diff --git a/idea/testData/psi/LocalDeclarations.jet b/compiler/testData/psi/LocalDeclarations.jet similarity index 100% rename from idea/testData/psi/LocalDeclarations.jet rename to compiler/testData/psi/LocalDeclarations.jet diff --git a/idea/testData/psi/LocalDeclarations.txt b/compiler/testData/psi/LocalDeclarations.txt similarity index 100% rename from idea/testData/psi/LocalDeclarations.txt rename to compiler/testData/psi/LocalDeclarations.txt diff --git a/idea/testData/psi/ModifierAsSelector.jet b/compiler/testData/psi/ModifierAsSelector.jet similarity index 100% rename from idea/testData/psi/ModifierAsSelector.jet rename to compiler/testData/psi/ModifierAsSelector.jet diff --git a/idea/testData/psi/ModifierAsSelector.txt b/compiler/testData/psi/ModifierAsSelector.txt similarity index 100% rename from idea/testData/psi/ModifierAsSelector.txt rename to compiler/testData/psi/ModifierAsSelector.txt diff --git a/idea/testData/psi/NamespaceBlock.jet b/compiler/testData/psi/NamespaceBlock.jet similarity index 100% rename from idea/testData/psi/NamespaceBlock.jet rename to compiler/testData/psi/NamespaceBlock.jet diff --git a/idea/testData/psi/NamespaceBlock.txt b/compiler/testData/psi/NamespaceBlock.txt similarity index 100% rename from idea/testData/psi/NamespaceBlock.txt rename to compiler/testData/psi/NamespaceBlock.txt diff --git a/idea/testData/psi/NamespaceBlockFirst.jet b/compiler/testData/psi/NamespaceBlockFirst.jet similarity index 100% rename from idea/testData/psi/NamespaceBlockFirst.jet rename to compiler/testData/psi/NamespaceBlockFirst.jet diff --git a/idea/testData/psi/NamespaceBlockFirst.txt b/compiler/testData/psi/NamespaceBlockFirst.txt similarity index 100% rename from idea/testData/psi/NamespaceBlockFirst.txt rename to compiler/testData/psi/NamespaceBlockFirst.txt diff --git a/idea/testData/psi/NamespaceBlock_ERR.jet b/compiler/testData/psi/NamespaceBlock_ERR.jet similarity index 100% rename from idea/testData/psi/NamespaceBlock_ERR.jet rename to compiler/testData/psi/NamespaceBlock_ERR.jet diff --git a/idea/testData/psi/NamespaceBlock_ERR.txt b/compiler/testData/psi/NamespaceBlock_ERR.txt similarity index 100% rename from idea/testData/psi/NamespaceBlock_ERR.txt rename to compiler/testData/psi/NamespaceBlock_ERR.txt diff --git a/idea/testData/psi/NamespaceModifiers.jet b/compiler/testData/psi/NamespaceModifiers.jet similarity index 100% rename from idea/testData/psi/NamespaceModifiers.jet rename to compiler/testData/psi/NamespaceModifiers.jet diff --git a/idea/testData/psi/NamespaceModifiers.txt b/compiler/testData/psi/NamespaceModifiers.txt similarity index 100% rename from idea/testData/psi/NamespaceModifiers.txt rename to compiler/testData/psi/NamespaceModifiers.txt diff --git a/idea/testData/psi/NewlinesInParentheses.jet b/compiler/testData/psi/NewlinesInParentheses.jet similarity index 100% rename from idea/testData/psi/NewlinesInParentheses.jet rename to compiler/testData/psi/NewlinesInParentheses.jet diff --git a/idea/testData/psi/NewlinesInParentheses.txt b/compiler/testData/psi/NewlinesInParentheses.txt similarity index 100% rename from idea/testData/psi/NewlinesInParentheses.txt rename to compiler/testData/psi/NewlinesInParentheses.txt diff --git a/idea/testData/psi/NotIsAndNotIn.jet b/compiler/testData/psi/NotIsAndNotIn.jet similarity index 100% rename from idea/testData/psi/NotIsAndNotIn.jet rename to compiler/testData/psi/NotIsAndNotIn.jet diff --git a/idea/testData/psi/NotIsAndNotIn.txt b/compiler/testData/psi/NotIsAndNotIn.txt similarity index 100% rename from idea/testData/psi/NotIsAndNotIn.txt rename to compiler/testData/psi/NotIsAndNotIn.txt diff --git a/idea/testData/psi/Precedence.jet b/compiler/testData/psi/Precedence.jet similarity index 100% rename from idea/testData/psi/Precedence.jet rename to compiler/testData/psi/Precedence.jet diff --git a/idea/testData/psi/Precedence.txt b/compiler/testData/psi/Precedence.txt similarity index 100% rename from idea/testData/psi/Precedence.txt rename to compiler/testData/psi/Precedence.txt diff --git a/idea/testData/psi/PredicateExpression.jet b/compiler/testData/psi/PredicateExpression.jet similarity index 100% rename from idea/testData/psi/PredicateExpression.jet rename to compiler/testData/psi/PredicateExpression.jet diff --git a/idea/testData/psi/PredicateExpression.txt b/compiler/testData/psi/PredicateExpression.txt similarity index 100% rename from idea/testData/psi/PredicateExpression.txt rename to compiler/testData/psi/PredicateExpression.txt diff --git a/idea/testData/psi/Properties.jet b/compiler/testData/psi/Properties.jet similarity index 100% rename from idea/testData/psi/Properties.jet rename to compiler/testData/psi/Properties.jet diff --git a/idea/testData/psi/Properties.txt b/compiler/testData/psi/Properties.txt similarity index 100% rename from idea/testData/psi/Properties.txt rename to compiler/testData/psi/Properties.txt diff --git a/idea/testData/psi/PropertiesFollowedByInitializers.jet b/compiler/testData/psi/PropertiesFollowedByInitializers.jet similarity index 100% rename from idea/testData/psi/PropertiesFollowedByInitializers.jet rename to compiler/testData/psi/PropertiesFollowedByInitializers.jet diff --git a/idea/testData/psi/PropertiesFollowedByInitializers.txt b/compiler/testData/psi/PropertiesFollowedByInitializers.txt similarity index 100% rename from idea/testData/psi/PropertiesFollowedByInitializers.txt rename to compiler/testData/psi/PropertiesFollowedByInitializers.txt diff --git a/idea/testData/psi/Properties_ERR.jet b/compiler/testData/psi/Properties_ERR.jet similarity index 100% rename from idea/testData/psi/Properties_ERR.jet rename to compiler/testData/psi/Properties_ERR.jet diff --git a/idea/testData/psi/Properties_ERR.txt b/compiler/testData/psi/Properties_ERR.txt similarity index 100% rename from idea/testData/psi/Properties_ERR.txt rename to compiler/testData/psi/Properties_ERR.txt diff --git a/idea/testData/psi/QuotedIdentifiers.jet b/compiler/testData/psi/QuotedIdentifiers.jet similarity index 100% rename from idea/testData/psi/QuotedIdentifiers.jet rename to compiler/testData/psi/QuotedIdentifiers.jet diff --git a/idea/testData/psi/QuotedIdentifiers.txt b/compiler/testData/psi/QuotedIdentifiers.txt similarity index 100% rename from idea/testData/psi/QuotedIdentifiers.txt rename to compiler/testData/psi/QuotedIdentifiers.txt diff --git a/idea/testData/psi/RootNamespace.jet b/compiler/testData/psi/RootNamespace.jet similarity index 100% rename from idea/testData/psi/RootNamespace.jet rename to compiler/testData/psi/RootNamespace.jet diff --git a/idea/testData/psi/RootNamespace.txt b/compiler/testData/psi/RootNamespace.txt similarity index 100% rename from idea/testData/psi/RootNamespace.txt rename to compiler/testData/psi/RootNamespace.txt diff --git a/idea/testData/psi/SemicolonAfterIf.jet b/compiler/testData/psi/SemicolonAfterIf.jet similarity index 100% rename from idea/testData/psi/SemicolonAfterIf.jet rename to compiler/testData/psi/SemicolonAfterIf.jet diff --git a/idea/testData/psi/SemicolonAfterIf.txt b/compiler/testData/psi/SemicolonAfterIf.txt similarity index 100% rename from idea/testData/psi/SemicolonAfterIf.txt rename to compiler/testData/psi/SemicolonAfterIf.txt diff --git a/idea/testData/psi/ShortAnnotations.jet b/compiler/testData/psi/ShortAnnotations.jet similarity index 100% rename from idea/testData/psi/ShortAnnotations.jet rename to compiler/testData/psi/ShortAnnotations.jet diff --git a/idea/testData/psi/ShortAnnotations.txt b/compiler/testData/psi/ShortAnnotations.txt similarity index 100% rename from idea/testData/psi/ShortAnnotations.txt rename to compiler/testData/psi/ShortAnnotations.txt diff --git a/idea/testData/psi/SimpleClassMembers.jet b/compiler/testData/psi/SimpleClassMembers.jet similarity index 100% rename from idea/testData/psi/SimpleClassMembers.jet rename to compiler/testData/psi/SimpleClassMembers.jet diff --git a/idea/testData/psi/SimpleClassMembers.txt b/compiler/testData/psi/SimpleClassMembers.txt similarity index 100% rename from idea/testData/psi/SimpleClassMembers.txt rename to compiler/testData/psi/SimpleClassMembers.txt diff --git a/idea/testData/psi/SimpleClassMembers_ERR.jet b/compiler/testData/psi/SimpleClassMembers_ERR.jet similarity index 100% rename from idea/testData/psi/SimpleClassMembers_ERR.jet rename to compiler/testData/psi/SimpleClassMembers_ERR.jet diff --git a/idea/testData/psi/SimpleClassMembers_ERR.txt b/compiler/testData/psi/SimpleClassMembers_ERR.txt similarity index 100% rename from idea/testData/psi/SimpleClassMembers_ERR.txt rename to compiler/testData/psi/SimpleClassMembers_ERR.txt diff --git a/idea/testData/psi/SimpleExpressions.jet b/compiler/testData/psi/SimpleExpressions.jet similarity index 100% rename from idea/testData/psi/SimpleExpressions.jet rename to compiler/testData/psi/SimpleExpressions.jet diff --git a/idea/testData/psi/SimpleExpressions.txt b/compiler/testData/psi/SimpleExpressions.txt similarity index 100% rename from idea/testData/psi/SimpleExpressions.txt rename to compiler/testData/psi/SimpleExpressions.txt diff --git a/idea/testData/psi/SimpleModifiers.jet b/compiler/testData/psi/SimpleModifiers.jet similarity index 100% rename from idea/testData/psi/SimpleModifiers.jet rename to compiler/testData/psi/SimpleModifiers.jet diff --git a/idea/testData/psi/SimpleModifiers.txt b/compiler/testData/psi/SimpleModifiers.txt similarity index 100% rename from idea/testData/psi/SimpleModifiers.txt rename to compiler/testData/psi/SimpleModifiers.txt diff --git a/idea/testData/psi/SoftKeywords.jet b/compiler/testData/psi/SoftKeywords.jet similarity index 100% rename from idea/testData/psi/SoftKeywords.jet rename to compiler/testData/psi/SoftKeywords.jet diff --git a/idea/testData/psi/SoftKeywords.txt b/compiler/testData/psi/SoftKeywords.txt similarity index 100% rename from idea/testData/psi/SoftKeywords.txt rename to compiler/testData/psi/SoftKeywords.txt diff --git a/idea/testData/psi/SoftKeywordsInTypeArguments.jet b/compiler/testData/psi/SoftKeywordsInTypeArguments.jet similarity index 100% rename from idea/testData/psi/SoftKeywordsInTypeArguments.jet rename to compiler/testData/psi/SoftKeywordsInTypeArguments.jet diff --git a/idea/testData/psi/SoftKeywordsInTypeArguments.txt b/compiler/testData/psi/SoftKeywordsInTypeArguments.txt similarity index 100% rename from idea/testData/psi/SoftKeywordsInTypeArguments.txt rename to compiler/testData/psi/SoftKeywordsInTypeArguments.txt diff --git a/idea/testData/psi/StringTemplates.jet b/compiler/testData/psi/StringTemplates.jet similarity index 100% rename from idea/testData/psi/StringTemplates.jet rename to compiler/testData/psi/StringTemplates.jet diff --git a/idea/testData/psi/StringTemplates.txt b/compiler/testData/psi/StringTemplates.txt similarity index 100% rename from idea/testData/psi/StringTemplates.txt rename to compiler/testData/psi/StringTemplates.txt diff --git a/idea/testData/psi/ThisType.jet b/compiler/testData/psi/ThisType.jet similarity index 100% rename from idea/testData/psi/ThisType.jet rename to compiler/testData/psi/ThisType.jet diff --git a/idea/testData/psi/ThisType.txt b/compiler/testData/psi/ThisType.txt similarity index 100% rename from idea/testData/psi/ThisType.txt rename to compiler/testData/psi/ThisType.txt diff --git a/idea/testData/psi/TupleTypes.jet b/compiler/testData/psi/TupleTypes.jet similarity index 100% rename from idea/testData/psi/TupleTypes.jet rename to compiler/testData/psi/TupleTypes.jet diff --git a/idea/testData/psi/TupleTypes.txt b/compiler/testData/psi/TupleTypes.txt similarity index 100% rename from idea/testData/psi/TupleTypes.txt rename to compiler/testData/psi/TupleTypes.txt diff --git a/idea/testData/psi/TupleTypes_ERR.jet b/compiler/testData/psi/TupleTypes_ERR.jet similarity index 100% rename from idea/testData/psi/TupleTypes_ERR.jet rename to compiler/testData/psi/TupleTypes_ERR.jet diff --git a/idea/testData/psi/TupleTypes_ERR.txt b/compiler/testData/psi/TupleTypes_ERR.txt similarity index 100% rename from idea/testData/psi/TupleTypes_ERR.txt rename to compiler/testData/psi/TupleTypes_ERR.txt diff --git a/idea/testData/psi/TuplesWithLabeledEntries.jet b/compiler/testData/psi/TuplesWithLabeledEntries.jet similarity index 100% rename from idea/testData/psi/TuplesWithLabeledEntries.jet rename to compiler/testData/psi/TuplesWithLabeledEntries.jet diff --git a/idea/testData/psi/TuplesWithLabeledEntries.txt b/compiler/testData/psi/TuplesWithLabeledEntries.txt similarity index 100% rename from idea/testData/psi/TuplesWithLabeledEntries.txt rename to compiler/testData/psi/TuplesWithLabeledEntries.txt diff --git a/idea/testData/psi/TypeAnnotations.jet b/compiler/testData/psi/TypeAnnotations.jet similarity index 100% rename from idea/testData/psi/TypeAnnotations.jet rename to compiler/testData/psi/TypeAnnotations.jet diff --git a/idea/testData/psi/TypeAnnotations.txt b/compiler/testData/psi/TypeAnnotations.txt similarity index 100% rename from idea/testData/psi/TypeAnnotations.txt rename to compiler/testData/psi/TypeAnnotations.txt diff --git a/idea/testData/psi/TypeConstraints.jet b/compiler/testData/psi/TypeConstraints.jet similarity index 100% rename from idea/testData/psi/TypeConstraints.jet rename to compiler/testData/psi/TypeConstraints.jet diff --git a/idea/testData/psi/TypeConstraints.txt b/compiler/testData/psi/TypeConstraints.txt similarity index 100% rename from idea/testData/psi/TypeConstraints.txt rename to compiler/testData/psi/TypeConstraints.txt diff --git a/idea/testData/psi/TypeDef.jet b/compiler/testData/psi/TypeDef.jet similarity index 100% rename from idea/testData/psi/TypeDef.jet rename to compiler/testData/psi/TypeDef.jet diff --git a/idea/testData/psi/TypeDef.txt b/compiler/testData/psi/TypeDef.txt similarity index 100% rename from idea/testData/psi/TypeDef.txt rename to compiler/testData/psi/TypeDef.txt diff --git a/idea/testData/psi/TypeDef_ERR.jet b/compiler/testData/psi/TypeDef_ERR.jet similarity index 100% rename from idea/testData/psi/TypeDef_ERR.jet rename to compiler/testData/psi/TypeDef_ERR.jet diff --git a/idea/testData/psi/TypeDef_ERR.txt b/compiler/testData/psi/TypeDef_ERR.txt similarity index 100% rename from idea/testData/psi/TypeDef_ERR.txt rename to compiler/testData/psi/TypeDef_ERR.txt diff --git a/idea/testData/psi/TypeExpressionAmbiguities_ERR.jet b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.jet similarity index 100% rename from idea/testData/psi/TypeExpressionAmbiguities_ERR.jet rename to compiler/testData/psi/TypeExpressionAmbiguities_ERR.jet diff --git a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt similarity index 100% rename from idea/testData/psi/TypeExpressionAmbiguities_ERR.txt rename to compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt diff --git a/idea/testData/psi/TypeParametersBeforeName.jet b/compiler/testData/psi/TypeParametersBeforeName.jet similarity index 100% rename from idea/testData/psi/TypeParametersBeforeName.jet rename to compiler/testData/psi/TypeParametersBeforeName.jet diff --git a/idea/testData/psi/TypeParametersBeforeName.txt b/compiler/testData/psi/TypeParametersBeforeName.txt similarity index 100% rename from idea/testData/psi/TypeParametersBeforeName.txt rename to compiler/testData/psi/TypeParametersBeforeName.txt diff --git a/idea/testData/psi/When.jet b/compiler/testData/psi/When.jet similarity index 100% rename from idea/testData/psi/When.jet rename to compiler/testData/psi/When.jet diff --git a/idea/testData/psi/When.txt b/compiler/testData/psi/When.txt similarity index 100% rename from idea/testData/psi/When.txt rename to compiler/testData/psi/When.txt diff --git a/idea/testData/psi/When_ERR.jet b/compiler/testData/psi/When_ERR.jet similarity index 100% rename from idea/testData/psi/When_ERR.jet rename to compiler/testData/psi/When_ERR.jet diff --git a/idea/testData/psi/When_ERR.txt b/compiler/testData/psi/When_ERR.txt similarity index 100% rename from idea/testData/psi/When_ERR.txt rename to compiler/testData/psi/When_ERR.txt diff --git a/idea/testData/psi/examples/AnonymousObjects.jet b/compiler/testData/psi/examples/AnonymousObjects.jet similarity index 100% rename from idea/testData/psi/examples/AnonymousObjects.jet rename to compiler/testData/psi/examples/AnonymousObjects.jet diff --git a/idea/testData/psi/examples/AnonymousObjects.txt b/compiler/testData/psi/examples/AnonymousObjects.txt similarity index 100% rename from idea/testData/psi/examples/AnonymousObjects.txt rename to compiler/testData/psi/examples/AnonymousObjects.txt diff --git a/idea/testData/psi/examples/BinaryTree.jet b/compiler/testData/psi/examples/BinaryTree.jet similarity index 100% rename from idea/testData/psi/examples/BinaryTree.jet rename to compiler/testData/psi/examples/BinaryTree.jet diff --git a/idea/testData/psi/examples/BinaryTree.txt b/compiler/testData/psi/examples/BinaryTree.txt similarity index 100% rename from idea/testData/psi/examples/BinaryTree.txt rename to compiler/testData/psi/examples/BinaryTree.txt diff --git a/idea/testData/psi/examples/BitArith.jet b/compiler/testData/psi/examples/BitArith.jet similarity index 100% rename from idea/testData/psi/examples/BitArith.jet rename to compiler/testData/psi/examples/BitArith.jet diff --git a/idea/testData/psi/examples/BitArith.txt b/compiler/testData/psi/examples/BitArith.txt similarity index 100% rename from idea/testData/psi/examples/BitArith.txt rename to compiler/testData/psi/examples/BitArith.txt diff --git a/idea/testData/psi/examples/Builder.jet b/compiler/testData/psi/examples/Builder.jet similarity index 100% rename from idea/testData/psi/examples/Builder.jet rename to compiler/testData/psi/examples/Builder.jet diff --git a/idea/testData/psi/examples/Builder.txt b/compiler/testData/psi/examples/Builder.txt similarity index 100% rename from idea/testData/psi/examples/Builder.txt rename to compiler/testData/psi/examples/Builder.txt diff --git a/idea/testData/psi/examples/Color.jet b/compiler/testData/psi/examples/Color.jet similarity index 100% rename from idea/testData/psi/examples/Color.jet rename to compiler/testData/psi/examples/Color.jet diff --git a/idea/testData/psi/examples/Color.txt b/compiler/testData/psi/examples/Color.txt similarity index 100% rename from idea/testData/psi/examples/Color.txt rename to compiler/testData/psi/examples/Color.txt diff --git a/idea/testData/psi/examples/FunctionsAndTypes.jet b/compiler/testData/psi/examples/FunctionsAndTypes.jet similarity index 100% rename from idea/testData/psi/examples/FunctionsAndTypes.jet rename to compiler/testData/psi/examples/FunctionsAndTypes.jet diff --git a/idea/testData/psi/examples/FunctionsAndTypes.txt b/compiler/testData/psi/examples/FunctionsAndTypes.txt similarity index 100% rename from idea/testData/psi/examples/FunctionsAndTypes.txt rename to compiler/testData/psi/examples/FunctionsAndTypes.txt diff --git a/idea/testData/psi/examples/Graph.jet b/compiler/testData/psi/examples/Graph.jet similarity index 100% rename from idea/testData/psi/examples/Graph.jet rename to compiler/testData/psi/examples/Graph.jet diff --git a/idea/testData/psi/examples/Graph.txt b/compiler/testData/psi/examples/Graph.txt similarity index 100% rename from idea/testData/psi/examples/Graph.txt rename to compiler/testData/psi/examples/Graph.txt diff --git a/idea/testData/psi/examples/IPushPop.jet b/compiler/testData/psi/examples/IPushPop.jet similarity index 100% rename from idea/testData/psi/examples/IPushPop.jet rename to compiler/testData/psi/examples/IPushPop.jet diff --git a/idea/testData/psi/examples/IPushPop.txt b/compiler/testData/psi/examples/IPushPop.txt similarity index 100% rename from idea/testData/psi/examples/IPushPop.txt rename to compiler/testData/psi/examples/IPushPop.txt diff --git a/idea/testData/psi/examples/LINQ.jet b/compiler/testData/psi/examples/LINQ.jet similarity index 100% rename from idea/testData/psi/examples/LINQ.jet rename to compiler/testData/psi/examples/LINQ.jet diff --git a/idea/testData/psi/examples/LINQ.txt b/compiler/testData/psi/examples/LINQ.txt similarity index 100% rename from idea/testData/psi/examples/LINQ.txt rename to compiler/testData/psi/examples/LINQ.txt diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.jet b/compiler/testData/psi/examples/PolymorphicClassObjects.jet similarity index 100% rename from idea/testData/psi/examples/PolymorphicClassObjects.jet rename to compiler/testData/psi/examples/PolymorphicClassObjects.jet diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.txt b/compiler/testData/psi/examples/PolymorphicClassObjects.txt similarity index 100% rename from idea/testData/psi/examples/PolymorphicClassObjects.txt rename to compiler/testData/psi/examples/PolymorphicClassObjects.txt diff --git a/idea/testData/psi/examples/Queue.jet b/compiler/testData/psi/examples/Queue.jet similarity index 100% rename from idea/testData/psi/examples/Queue.jet rename to compiler/testData/psi/examples/Queue.jet diff --git a/idea/testData/psi/examples/Queue.txt b/compiler/testData/psi/examples/Queue.txt similarity index 100% rename from idea/testData/psi/examples/Queue.txt rename to compiler/testData/psi/examples/Queue.txt diff --git a/idea/testData/psi/examples/Stack.jet b/compiler/testData/psi/examples/Stack.jet similarity index 100% rename from idea/testData/psi/examples/Stack.jet rename to compiler/testData/psi/examples/Stack.jet diff --git a/idea/testData/psi/examples/Stack.txt b/compiler/testData/psi/examples/Stack.txt similarity index 100% rename from idea/testData/psi/examples/Stack.txt rename to compiler/testData/psi/examples/Stack.txt diff --git a/idea/testData/psi/examples/UnionFind.jet b/compiler/testData/psi/examples/UnionFind.jet similarity index 100% rename from idea/testData/psi/examples/UnionFind.jet rename to compiler/testData/psi/examples/UnionFind.jet diff --git a/idea/testData/psi/examples/UnionFind.txt b/compiler/testData/psi/examples/UnionFind.txt similarity index 100% rename from idea/testData/psi/examples/UnionFind.txt rename to compiler/testData/psi/examples/UnionFind.txt diff --git a/idea/testData/psi/examples/UpdateOperation.jet b/compiler/testData/psi/examples/UpdateOperation.jet similarity index 100% rename from idea/testData/psi/examples/UpdateOperation.jet rename to compiler/testData/psi/examples/UpdateOperation.jet diff --git a/idea/testData/psi/examples/UpdateOperation.txt b/compiler/testData/psi/examples/UpdateOperation.txt similarity index 100% rename from idea/testData/psi/examples/UpdateOperation.txt rename to compiler/testData/psi/examples/UpdateOperation.txt diff --git a/idea/testData/psi/examples/With.jet b/compiler/testData/psi/examples/With.jet similarity index 100% rename from idea/testData/psi/examples/With.jet rename to compiler/testData/psi/examples/With.jet diff --git a/idea/testData/psi/examples/With.txt b/compiler/testData/psi/examples/With.txt similarity index 100% rename from idea/testData/psi/examples/With.txt rename to compiler/testData/psi/examples/With.txt diff --git a/idea/testData/psi/examples/array/MutableArray.jet b/compiler/testData/psi/examples/array/MutableArray.jet similarity index 100% rename from idea/testData/psi/examples/array/MutableArray.jet rename to compiler/testData/psi/examples/array/MutableArray.jet diff --git a/idea/testData/psi/examples/array/MutableArray.txt b/compiler/testData/psi/examples/array/MutableArray.txt similarity index 100% rename from idea/testData/psi/examples/array/MutableArray.txt rename to compiler/testData/psi/examples/array/MutableArray.txt diff --git a/idea/testData/psi/examples/collections/ArrayList.jet b/compiler/testData/psi/examples/collections/ArrayList.jet similarity index 100% rename from idea/testData/psi/examples/collections/ArrayList.jet rename to compiler/testData/psi/examples/collections/ArrayList.jet diff --git a/idea/testData/psi/examples/collections/ArrayList.txt b/compiler/testData/psi/examples/collections/ArrayList.txt similarity index 100% rename from idea/testData/psi/examples/collections/ArrayList.txt rename to compiler/testData/psi/examples/collections/ArrayList.txt diff --git a/idea/testData/psi/examples/collections/HashMap.jet b/compiler/testData/psi/examples/collections/HashMap.jet similarity index 100% rename from idea/testData/psi/examples/collections/HashMap.jet rename to compiler/testData/psi/examples/collections/HashMap.jet diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/compiler/testData/psi/examples/collections/HashMap.txt similarity index 100% rename from idea/testData/psi/examples/collections/HashMap.txt rename to compiler/testData/psi/examples/collections/HashMap.txt diff --git a/idea/testData/psi/examples/collections/IIterable.jet b/compiler/testData/psi/examples/collections/IIterable.jet similarity index 100% rename from idea/testData/psi/examples/collections/IIterable.jet rename to compiler/testData/psi/examples/collections/IIterable.jet diff --git a/idea/testData/psi/examples/collections/IIterable.txt b/compiler/testData/psi/examples/collections/IIterable.txt similarity index 100% rename from idea/testData/psi/examples/collections/IIterable.txt rename to compiler/testData/psi/examples/collections/IIterable.txt diff --git a/idea/testData/psi/examples/collections/IIterator.jet b/compiler/testData/psi/examples/collections/IIterator.jet similarity index 100% rename from idea/testData/psi/examples/collections/IIterator.jet rename to compiler/testData/psi/examples/collections/IIterator.jet diff --git a/idea/testData/psi/examples/collections/IIterator.txt b/compiler/testData/psi/examples/collections/IIterator.txt similarity index 100% rename from idea/testData/psi/examples/collections/IIterator.txt rename to compiler/testData/psi/examples/collections/IIterator.txt diff --git a/idea/testData/psi/examples/collections/IList.jet b/compiler/testData/psi/examples/collections/IList.jet similarity index 100% rename from idea/testData/psi/examples/collections/IList.jet rename to compiler/testData/psi/examples/collections/IList.jet diff --git a/idea/testData/psi/examples/collections/IList.txt b/compiler/testData/psi/examples/collections/IList.txt similarity index 100% rename from idea/testData/psi/examples/collections/IList.txt rename to compiler/testData/psi/examples/collections/IList.txt diff --git a/idea/testData/psi/examples/collections/IMutableIterable.jet b/compiler/testData/psi/examples/collections/IMutableIterable.jet similarity index 100% rename from idea/testData/psi/examples/collections/IMutableIterable.jet rename to compiler/testData/psi/examples/collections/IMutableIterable.jet diff --git a/idea/testData/psi/examples/collections/IMutableIterable.txt b/compiler/testData/psi/examples/collections/IMutableIterable.txt similarity index 100% rename from idea/testData/psi/examples/collections/IMutableIterable.txt rename to compiler/testData/psi/examples/collections/IMutableIterable.txt diff --git a/idea/testData/psi/examples/collections/IMutableIterator.jet b/compiler/testData/psi/examples/collections/IMutableIterator.jet similarity index 100% rename from idea/testData/psi/examples/collections/IMutableIterator.jet rename to compiler/testData/psi/examples/collections/IMutableIterator.jet diff --git a/idea/testData/psi/examples/collections/IMutableIterator.txt b/compiler/testData/psi/examples/collections/IMutableIterator.txt similarity index 100% rename from idea/testData/psi/examples/collections/IMutableIterator.txt rename to compiler/testData/psi/examples/collections/IMutableIterator.txt diff --git a/idea/testData/psi/examples/collections/IMutableList.jet b/compiler/testData/psi/examples/collections/IMutableList.jet similarity index 100% rename from idea/testData/psi/examples/collections/IMutableList.jet rename to compiler/testData/psi/examples/collections/IMutableList.jet diff --git a/idea/testData/psi/examples/collections/IMutableList.txt b/compiler/testData/psi/examples/collections/IMutableList.txt similarity index 100% rename from idea/testData/psi/examples/collections/IMutableList.txt rename to compiler/testData/psi/examples/collections/IMutableList.txt diff --git a/idea/testData/psi/examples/collections/IMutableSet.jet b/compiler/testData/psi/examples/collections/IMutableSet.jet similarity index 100% rename from idea/testData/psi/examples/collections/IMutableSet.jet rename to compiler/testData/psi/examples/collections/IMutableSet.jet diff --git a/idea/testData/psi/examples/collections/IMutableSet.txt b/compiler/testData/psi/examples/collections/IMutableSet.txt similarity index 100% rename from idea/testData/psi/examples/collections/IMutableSet.txt rename to compiler/testData/psi/examples/collections/IMutableSet.txt diff --git a/idea/testData/psi/examples/collections/ISet.jet b/compiler/testData/psi/examples/collections/ISet.jet similarity index 100% rename from idea/testData/psi/examples/collections/ISet.jet rename to compiler/testData/psi/examples/collections/ISet.jet diff --git a/idea/testData/psi/examples/collections/ISet.txt b/compiler/testData/psi/examples/collections/ISet.txt similarity index 100% rename from idea/testData/psi/examples/collections/ISet.txt rename to compiler/testData/psi/examples/collections/ISet.txt diff --git a/idea/testData/psi/examples/collections/ISized.jet b/compiler/testData/psi/examples/collections/ISized.jet similarity index 100% rename from idea/testData/psi/examples/collections/ISized.jet rename to compiler/testData/psi/examples/collections/ISized.jet diff --git a/idea/testData/psi/examples/collections/ISized.txt b/compiler/testData/psi/examples/collections/ISized.txt similarity index 100% rename from idea/testData/psi/examples/collections/ISized.txt rename to compiler/testData/psi/examples/collections/ISized.txt diff --git a/idea/testData/psi/examples/collections/LinkedList.jet b/compiler/testData/psi/examples/collections/LinkedList.jet similarity index 100% rename from idea/testData/psi/examples/collections/LinkedList.jet rename to compiler/testData/psi/examples/collections/LinkedList.jet diff --git a/idea/testData/psi/examples/collections/LinkedList.txt b/compiler/testData/psi/examples/collections/LinkedList.txt similarity index 100% rename from idea/testData/psi/examples/collections/LinkedList.txt rename to compiler/testData/psi/examples/collections/LinkedList.txt diff --git a/idea/testData/psi/examples/collections/List.jet b/compiler/testData/psi/examples/collections/List.jet similarity index 100% rename from idea/testData/psi/examples/collections/List.jet rename to compiler/testData/psi/examples/collections/List.jet diff --git a/idea/testData/psi/examples/collections/List.txt b/compiler/testData/psi/examples/collections/List.txt similarity index 100% rename from idea/testData/psi/examples/collections/List.txt rename to compiler/testData/psi/examples/collections/List.txt diff --git a/idea/testData/psi/examples/io/IOSamples.jet b/compiler/testData/psi/examples/io/IOSamples.jet similarity index 100% rename from idea/testData/psi/examples/io/IOSamples.jet rename to compiler/testData/psi/examples/io/IOSamples.jet diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/compiler/testData/psi/examples/io/IOSamples.txt similarity index 100% rename from idea/testData/psi/examples/io/IOSamples.txt rename to compiler/testData/psi/examples/io/IOSamples.txt diff --git a/idea/testData/psi/examples/map/IMap.jet b/compiler/testData/psi/examples/map/IMap.jet similarity index 100% rename from idea/testData/psi/examples/map/IMap.jet rename to compiler/testData/psi/examples/map/IMap.jet diff --git a/idea/testData/psi/examples/map/IMap.txt b/compiler/testData/psi/examples/map/IMap.txt similarity index 100% rename from idea/testData/psi/examples/map/IMap.txt rename to compiler/testData/psi/examples/map/IMap.txt diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.jet b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.jet similarity index 100% rename from idea/testData/psi/examples/priorityqueues/BinaryHeap.jet rename to compiler/testData/psi/examples/priorityqueues/BinaryHeap.jet diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt similarity index 100% rename from idea/testData/psi/examples/priorityqueues/BinaryHeap.txt rename to compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt diff --git a/idea/testData/psi/examples/priorityqueues/IPriorityQueue.jet b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.jet similarity index 100% rename from idea/testData/psi/examples/priorityqueues/IPriorityQueue.jet rename to compiler/testData/psi/examples/priorityqueues/IPriorityQueue.jet diff --git a/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt similarity index 100% rename from idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt rename to compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet similarity index 100% rename from idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet rename to compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt similarity index 100% rename from idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt rename to compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt diff --git a/idea/testData/psi/examples/util/Comparison.jet b/compiler/testData/psi/examples/util/Comparison.jet similarity index 100% rename from idea/testData/psi/examples/util/Comparison.jet rename to compiler/testData/psi/examples/util/Comparison.jet diff --git a/idea/testData/psi/examples/util/Comparison.txt b/compiler/testData/psi/examples/util/Comparison.txt similarity index 100% rename from idea/testData/psi/examples/util/Comparison.txt rename to compiler/testData/psi/examples/util/Comparison.txt diff --git a/idea/testData/psi/examples/util/IComparable.jet b/compiler/testData/psi/examples/util/IComparable.jet similarity index 100% rename from idea/testData/psi/examples/util/IComparable.jet rename to compiler/testData/psi/examples/util/IComparable.jet diff --git a/idea/testData/psi/examples/util/IComparable.txt b/compiler/testData/psi/examples/util/IComparable.txt similarity index 100% rename from idea/testData/psi/examples/util/IComparable.txt rename to compiler/testData/psi/examples/util/IComparable.txt diff --git a/idea/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet similarity index 100% rename from idea/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet rename to compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet diff --git a/idea/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet similarity index 100% rename from idea/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet rename to compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet diff --git a/idea/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet similarity index 100% rename from idea/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet rename to compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet diff --git a/idea/testData/resolve/Basic.jet b/compiler/testData/resolve/Basic.jet similarity index 100% rename from idea/testData/resolve/Basic.jet rename to compiler/testData/resolve/Basic.jet diff --git a/idea/testData/resolve/ClassObjects.jet b/compiler/testData/resolve/ClassObjects.jet similarity index 100% rename from idea/testData/resolve/ClassObjects.jet rename to compiler/testData/resolve/ClassObjects.jet diff --git a/idea/testData/resolve/Classifiers.jet b/compiler/testData/resolve/Classifiers.jet similarity index 100% rename from idea/testData/resolve/Classifiers.jet rename to compiler/testData/resolve/Classifiers.jet diff --git a/idea/testData/resolve/ConstructorsAndInitializers.jet b/compiler/testData/resolve/ConstructorsAndInitializers.jet similarity index 100% rename from idea/testData/resolve/ConstructorsAndInitializers.jet rename to compiler/testData/resolve/ConstructorsAndInitializers.jet diff --git a/idea/testData/resolve/ErrorSupertype.jet b/compiler/testData/resolve/ErrorSupertype.jet similarity index 100% rename from idea/testData/resolve/ErrorSupertype.jet rename to compiler/testData/resolve/ErrorSupertype.jet diff --git a/idea/testData/resolve/ExtensionFunctions.jet b/compiler/testData/resolve/ExtensionFunctions.jet similarity index 100% rename from idea/testData/resolve/ExtensionFunctions.jet rename to compiler/testData/resolve/ExtensionFunctions.jet diff --git a/idea/testData/resolve/FunctionVariable.jet b/compiler/testData/resolve/FunctionVariable.jet similarity index 100% rename from idea/testData/resolve/FunctionVariable.jet rename to compiler/testData/resolve/FunctionVariable.jet diff --git a/idea/testData/resolve/LocalObjects.jet b/compiler/testData/resolve/LocalObjects.jet similarity index 100% rename from idea/testData/resolve/LocalObjects.jet rename to compiler/testData/resolve/LocalObjects.jet diff --git a/idea/testData/resolve/Namespaces.jet b/compiler/testData/resolve/Namespaces.jet similarity index 100% rename from idea/testData/resolve/Namespaces.jet rename to compiler/testData/resolve/Namespaces.jet diff --git a/idea/testData/resolve/NestedObjects.jet b/compiler/testData/resolve/NestedObjects.jet similarity index 100% rename from idea/testData/resolve/NestedObjects.jet rename to compiler/testData/resolve/NestedObjects.jet diff --git a/idea/testData/resolve/Objects.jet b/compiler/testData/resolve/Objects.jet similarity index 100% rename from idea/testData/resolve/Objects.jet rename to compiler/testData/resolve/Objects.jet diff --git a/idea/testData/resolve/PrimaryConstructorParameters.jet b/compiler/testData/resolve/PrimaryConstructorParameters.jet similarity index 100% rename from idea/testData/resolve/PrimaryConstructorParameters.jet rename to compiler/testData/resolve/PrimaryConstructorParameters.jet diff --git a/idea/testData/resolve/PrimaryConstructors.jet b/compiler/testData/resolve/PrimaryConstructors.jet similarity index 100% rename from idea/testData/resolve/PrimaryConstructors.jet rename to compiler/testData/resolve/PrimaryConstructors.jet diff --git a/idea/testData/resolve/Projections.jet b/compiler/testData/resolve/Projections.jet similarity index 100% rename from idea/testData/resolve/Projections.jet rename to compiler/testData/resolve/Projections.jet diff --git a/idea/testData/resolve/ResolveOfInfixExpressions.jet b/compiler/testData/resolve/ResolveOfInfixExpressions.jet similarity index 100% rename from idea/testData/resolve/ResolveOfInfixExpressions.jet rename to compiler/testData/resolve/ResolveOfInfixExpressions.jet diff --git a/idea/testData/resolve/ResolveToJava.jet b/compiler/testData/resolve/ResolveToJava.jet similarity index 100% rename from idea/testData/resolve/ResolveToJava.jet rename to compiler/testData/resolve/ResolveToJava.jet diff --git a/idea/testData/resolve/ScopeInteraction.jet b/compiler/testData/resolve/ScopeInteraction.jet similarity index 100% rename from idea/testData/resolve/ScopeInteraction.jet rename to compiler/testData/resolve/ScopeInteraction.jet diff --git a/idea/testData/resolve/StringTemplates.jet b/compiler/testData/resolve/StringTemplates.jet similarity index 100% rename from idea/testData/resolve/StringTemplates.jet rename to compiler/testData/resolve/StringTemplates.jet diff --git a/idea/testData/resolve/TryCatch.jet b/compiler/testData/resolve/TryCatch.jet similarity index 100% rename from idea/testData/resolve/TryCatch.jet rename to compiler/testData/resolve/TryCatch.jet diff --git a/idea/testData/resolve/regressions/kt300.jet b/compiler/testData/resolve/regressions/kt300.jet similarity index 100% rename from idea/testData/resolve/regressions/kt300.jet rename to compiler/testData/resolve/regressions/kt300.jet diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml new file mode 100644 index 00000000000..d1dadb8a16b --- /dev/null +++ b/compiler/tests/compiler-tests.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/idea/tests/org/jetbrains/jet/JetLightProjectDescriptor.java b/compiler/tests/org/jetbrains/jet/JetLightProjectDescriptor.java similarity index 100% rename from idea/tests/org/jetbrains/jet/JetLightProjectDescriptor.java rename to compiler/tests/org/jetbrains/jet/JetLightProjectDescriptor.java diff --git a/idea/tests/org/jetbrains/jet/JetLiteFixture.java b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java similarity index 100% rename from idea/tests/org/jetbrains/jet/JetLiteFixture.java rename to compiler/tests/org/jetbrains/jet/JetLiteFixture.java diff --git a/idea/tests/org/jetbrains/jet/JetTestCaseBase.java b/compiler/tests/org/jetbrains/jet/JetTestCaseBase.java similarity index 95% rename from idea/tests/org/jetbrains/jet/JetTestCaseBase.java rename to compiler/tests/org/jetbrains/jet/JetTestCaseBase.java index f6ba28dcb72..88dd75b955a 100644 --- a/idea/tests/org/jetbrains/jet/JetTestCaseBase.java +++ b/compiler/tests/org/jetbrains/jet/JetTestCaseBase.java @@ -35,7 +35,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { } public static Sdk jdkFromIdeaHome() { - return new JavaSdkImpl().createJdk("JDK", "idea/testData/mockJDK-1.7/jre", true); + return new JavaSdkImpl().createJdk("JDK", "compiler/testData/mockJDK-1.7/jre", true); } @Override @@ -44,7 +44,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { } public static String getTestDataPathBase() { - return getHomeDirectory() + "/idea/testData"; + return getHomeDirectory() + "/compiler/testData"; } public static String getHomeDirectory() { diff --git a/idea/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java similarity index 100% rename from idea/tests/org/jetbrains/jet/JetTestUtils.java rename to compiler/tests/org/jetbrains/jet/JetTestUtils.java diff --git a/idea/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java similarity index 99% rename from idea/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java rename to compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java index 0399c97acf3..bb51aee9cc4 100644 --- a/idea/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java @@ -18,7 +18,7 @@ import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; -import org.jetbrains.jet.plugin.AnalyzerFacade; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import java.io.File; import java.io.FileNotFoundException; diff --git a/idea/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java rename to compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java diff --git a/idea/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java b/compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java rename to compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java index 597eb5e2b95..d71414210c2 100644 --- a/idea/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java @@ -5,6 +5,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; +import com.intellij.testFramework.LightPlatformCodeInsightTestCase; import junit.framework.Test; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -12,7 +13,7 @@ import org.jetbrains.jet.JetTestCaseBase; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.plugin.AnalyzerFacade; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import java.io.File; import java.io.FileWriter; diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java rename to compiler/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java diff --git a/idea/tests/org/jetbrains/jet/checkers/QuickJetPsiCheckerTest.java b/compiler/tests/org/jetbrains/jet/checkers/QuickJetPsiCheckerTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/checkers/QuickJetPsiCheckerTest.java rename to compiler/tests/org/jetbrains/jet/checkers/QuickJetPsiCheckerTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/ArrayGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/codegen/ArrayGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java index a7aa2572f54..f5f89630aa5 100644 --- a/idea/tests/org/jetbrains/jet/codegen/ArrayGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java @@ -1,10 +1,6 @@ package org.jetbrains.jet.codegen; -import jet.typeinfo.TypeInfo; - -import java.lang.reflect.Array; import java.lang.reflect.Method; -import java.util.ArrayList; public class ArrayGenTest extends CodegenTestCase { public void testKt238 () throws Exception { diff --git a/idea/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java similarity index 88% rename from idea/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java index 2f89c65b0e7..2fcda7706f7 100644 --- a/idea/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java @@ -1,7 +1,5 @@ package org.jetbrains.jet.codegen; -import java.util.List; - public class BridgeMethodGenTest extends CodegenTestCase { public void testBridgeMethod () throws Exception { blackBoxFile("bridge.jet"); diff --git a/idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java rename to compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java diff --git a/idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java rename to compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java b/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java rename to compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/FunctionGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/ObjectGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/ObjectGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java b/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java rename to compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java rename to compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java rename to compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/SafeRefTest.java b/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/SafeRefTest.java rename to compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/TraitsTest.java b/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/TraitsTest.java rename to compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java diff --git a/idea/tests/org/jetbrains/jet/codegen/TypeInfoTest.java b/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/codegen/TypeInfoTest.java rename to compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java diff --git a/idea/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java b/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java similarity index 100% rename from idea/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java rename to compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java diff --git a/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java rename to compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java index 6e1b8238abf..6413d420c30 100644 --- a/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java +++ b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java @@ -41,7 +41,7 @@ public class JetParsingTest extends ParsingTestCase { } public static String getTestDataDir() { - return getHomeDirectory() + "/idea/testData"; + return getHomeDirectory() + "/compiler/testData"; } private static String getHomeDirectory() { diff --git a/idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java similarity index 97% rename from idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java rename to compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 6eae3034292..2a86bdc82d5 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -13,11 +13,11 @@ import org.jetbrains.jet.lang.diagnostics.UnresolvedReferenceDiagnostic; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetStandardLibrary; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.plugin.AnalyzerFacade; import java.util.HashMap; import java.util.HashSet; @@ -172,7 +172,9 @@ public class ExpectedResolveData { JetTypeReference typeReference = getAncestorOfType(JetTypeReference.class, element); if (expectedDescriptor != null) { DeclarationDescriptor actual = bindingContext.get(REFERENCE_TARGET, reference); - assertSame("Expected: " + name, expectedDescriptor.getOriginal(), actual == null ? null : actual.getOriginal()); + assertSame("Expected: " + name, expectedDescriptor.getOriginal(), actual == null + ? null + : actual.getOriginal()); continue; } diff --git a/idea/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java similarity index 100% rename from idea/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java rename to compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java diff --git a/idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java rename to compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index 2d1afcd62c7..f93dda39119 100644 --- a/idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -17,11 +17,13 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.calls.CallResolver; +import org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.jet.lang.types.JetStandardLibrary; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.parsing.JetParsingTest; import java.io.File; @@ -128,7 +130,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase { @Override protected String getTestDataPath() { - return getHomeDirectory() + "/idea/testData"; + return getHomeDirectory() + "/compiler/testData"; } @Override @@ -151,7 +153,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase { } public static Test suite() { - return JetTestCaseBase.suiteForDirectory(getHomeDirectory() + "/idea/testData/", "/resolve/", true, new JetTestCaseBase.NamedTestFactory() { + return JetTestCaseBase.suiteForDirectory(getHomeDirectory() + "/compiler/testData/", "/resolve/", true, new JetTestCaseBase.NamedTestFactory() { @NotNull @Override public Test createTest(@NotNull String dataPath, @NotNull String name) { diff --git a/idea/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java similarity index 99% rename from idea/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java rename to compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 2eb81e3b963..9b48938707a 100644 --- a/idea/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -7,11 +7,11 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.ClassDescriptorResolver; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.JetStandardLibrary; -import org.jetbrains.jet.plugin.AnalyzerFacade; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/types/JetOverridingTest.java rename to compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index 913fdecbd7e..2af92fa5a29 100644 --- a/idea/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -6,11 +6,11 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.psi.JetNamedFunction; +import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.ClassDescriptorResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.jet.lang.types.JetStandardLibrary; import org.jetbrains.jet.parsing.JetParsingTest; import java.io.File; @@ -35,7 +35,7 @@ public class JetOverridingTest extends LightDaemonAnalyzerTestCase { @Override protected String getTestDataPath() { - return getHomeDirectory() + "/idea/testData"; + return getHomeDirectory() + "/compiler/testData"; } private static String getHomeDirectory() { diff --git a/idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java similarity index 99% rename from idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java rename to compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index 7ea91dd752c..651fb148cf1 100644 --- a/idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -51,7 +51,7 @@ public class JetTypeCheckerTest extends LightDaemonAnalyzerTestCase { @Override protected String getTestDataPath() { - return getHomeDirectory() + "/idea/testData"; + return getHomeDirectory() + "/compiler/testData"; } private static String getHomeDirectory() { diff --git a/idea/idea.iml b/idea/idea.iml index f59f50c0a63..c994d198190 100644 --- a/idea/idea.iml +++ b/idea/idea.iml @@ -21,6 +21,7 @@ + diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 68ff66afb3d..bdcca23ba32 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -8,6 +8,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.resolve.DescriptorRenderer; /** diff --git a/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java index b9c35a7986d..6672b66de6e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java @@ -10,7 +10,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.jet.checkers.CheckerTestUtil; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.plugin.AnalyzerFacade; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import java.awt.*; import java.awt.datatransfer.Clipboard; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index 26f778b3fe1..4611f9cc010 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -12,8 +12,8 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.plugin.AnalyzerFacade; import org.jetbrains.jet.plugin.JetLanguage; /** diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java b/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java index d749f54e81b..9c6702b742c 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java @@ -16,9 +16,9 @@ import org.jetbrains.jet.lang.diagnostics.UnresolvedReferenceDiagnostic; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.plugin.AnalyzerFacade; import org.jetbrains.jet.plugin.JetHighlighter; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java index e53c0587f4e..299adbff7dc 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.plugin.AnalyzerFacade; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.resolve.DescriptorRenderer; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java index 95962f451d8..d2be0e6939d 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java @@ -22,8 +22,8 @@ import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.plugin.AnalyzerFacade; import org.jetbrains.jet.plugin.JetHighlighter; import org.jetbrains.jet.plugin.quickfix.JetIntentionActionFactory; import org.jetbrains.jet.plugin.quickfix.QuickFixes; diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java index 073d4d9ba61..f22310cf037 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java @@ -21,8 +21,8 @@ import org.jetbrains.jet.codegen.GenerationState; import org.jetbrains.jet.codegen.JetTypeMapper; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.types.JetStandardLibrary; -import org.jetbrains.jet.plugin.AnalyzerFacade; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java index 76cdd4a0a42..220bc1923d3 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java @@ -12,7 +12,7 @@ import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl; -import org.jetbrains.jet.plugin.AnalyzerFacade; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java index 55d454b3c50..85b0ee34e89 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java @@ -13,9 +13,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.plugin.AnalyzerFacade; import org.jetbrains.jet.resolve.DescriptorRenderer; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractModifierFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractModifierFixTest.java index cbade4283ca..91542507b41 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractModifierFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractModifierFixTest.java @@ -1,7 +1,6 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; -import org.jetbrains.jet.JetTestCaseBase; /** * @author svtk @@ -19,6 +18,6 @@ public class AbstractModifierFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddPrimaryConstructorFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AddPrimaryConstructorFixTest.java index c8a067576f9..633f5f8b09d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddPrimaryConstructorFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AddPrimaryConstructorFixTest.java @@ -19,6 +19,6 @@ public class AddPrimaryConstructorFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFixTest.java index e2b04a75f1f..78f7e287f9f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFixTest.java @@ -1,7 +1,6 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; -import org.jetbrains.jet.JetTestCaseBase; /** * @author svtk @@ -19,6 +18,6 @@ public class ChangeVariableMutabilityFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ClassImportFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ClassImportFixTest.java index 215a15eb5b2..d765f6aad5c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ClassImportFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ClassImportFixTest.java @@ -20,7 +20,7 @@ public class ClassImportFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ExpressionsFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ExpressionsFixTest.java index 9e0affacba6..ad60d7b72e5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ExpressionsFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ExpressionsFixTest.java @@ -19,6 +19,6 @@ public class ExpressionsFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ModifiersFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ModifiersFixTest.java index 66b299fded9..32ce67866dd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ModifiersFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ModifiersFixTest.java @@ -19,7 +19,7 @@ public class ModifiersFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/OverrideModifierFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/OverrideModifierFixTest.java index 2a67aa23aeb..6969bcce9b8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/OverrideModifierFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/OverrideModifierFixTest.java @@ -19,7 +19,7 @@ public class OverrideModifierFixTest extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java new file mode 100644 index 00000000000..c65a3ff5e3f --- /dev/null +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java @@ -0,0 +1,12 @@ +package org.jetbrains.jet.plugin.quickfix; + +import org.jetbrains.jet.JetTestCaseBase; + +/** + * @author yole + */ +public class PluginTestCaseBase { + public static String getTestDataPathBase() { + return JetTestCaseBase.getHomeDirectory() + "/idea/testData"; + } +} diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/TypeAdditionFixTests.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/TypeAdditionFixTests.java index b9154602f09..c870f1e6088 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/TypeAdditionFixTests.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/TypeAdditionFixTests.java @@ -20,7 +20,7 @@ public class TypeAdditionFixTests extends LightQuickFixTestCase { @Override protected String getTestDataPath() { - return JetTestCaseBase.getTestDataPathBase(); + return PluginTestCaseBase.getTestDataPathBase(); } @Override