From 7bc2736568c7bbee87dabb7ad51c2a54baa7fb81 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 25 Nov 2011 18:22:40 +0400 Subject: [PATCH] merge FullJetPsiCheckerTest into QuickJetPsiCheckerTest --- .../full/regression/Jet53.jet | 4 - .../{full => quick}/Abstract.jet | 4 +- .../{full => quick}/AnonymousInitializers.jet | 0 .../quick/AutocastsForStableIdentifiers.jet | 2 +- .../BinaryCallsOnNullableValues.jet | 0 .../{full => quick}/Bounds.jet | 0 .../{full => quick}/BreakContinue.jet | 0 .../{full => quick}/Builders.jet | 2 + .../{full => quick}/Casts.jet | 0 .../{full => quick}/ClassObjects.jet | 4 +- .../{full => quick}/Constants.jet | 0 .../{full => quick}/Constructors.jet | 0 .../{full => quick}/CovariantOverrideType.jet | 2 + .../{full => quick}/CyclicHierarchy.jet | 0 .../{full => quick}/Enums.jet | 0 .../{full => quick}/ExtensionFunctions.jet | 4 +- .../{full => quick}/ForRangeConventions.jet | 2 + .../{full => quick}/FunctionReturnTypes.jet | 4 +- .../GenericArgumentConsistency.jet | 0 .../{full => quick}/IllegalModifiers.jet | 0 .../{full => quick}/IncDec.jet | 0 .../{full => quick}/IsExpressions.jet | 0 .../{full => quick}/MultipleBounds.jet | 0 .../{full => quick}/NamespaceAsExpression.jet | 0 .../NamespaceInExpressionPosition.jet | 2 + .../{full => quick}/NamespaceQualified.jet | 4 +- .../{full => quick}/Nullability.jet | 4 +- .../{full => quick}/Objects.jet | 0 .../{full => quick}/PrimaryConstructors.jet | 0 .../ProjectionsInSupertypes.jet | 0 .../{full => quick}/Properties.jet | 0 .../{full => quick}/QualifiedExpressions.jet | 0 .../{full => quick}/QualifiedThis.jet | 0 .../RecursiveTypeInference.jet | 0 .../{full => quick}/Redeclarations.jet | 0 .../{full => quick}/ResolveOfJavaGenerics.jet | 4 +- .../{full => quick}/ResolveToJava.jet | 4 +- .../{full => quick}/Return.jet | 0 .../{full => quick}/StringTemplates.jet | 0 .../{full => quick}/SupertypeListChecks.jet | 0 .../{full => quick}/TraitSupertypeList.jet | 0 .../{full => quick}/UnreachableCode.jet | 2 + .../{full => quick}/Unresolved.jet | 0 .../ValAndFunOverrideCompatibilityClash.jet | 2 + .../{full => quick}/VarargTypes.jet | 3 +- .../{full => quick}/Variance.jet | 0 .../{full => quick}/When.jet | 0 .../{full => quick}/cast/AsErasedError.jet | 2 + .../{full => quick}/cast/AsErasedFine.jet | 2 + .../{full => quick}/cast/AsErasedStar.jet | 2 + .../{full => quick}/cast/AsErasedWarning.jet | 2 + .../{full => quick}/cast/IsErasedAllow.jet | 2 + .../cast/IsErasedAllowParameterSubtype.jet | 2 + .../cast/IsErasedDisallowFromAny.jet | 2 + .../{full => quick}/cast/IsErasedStar.jet | 2 + .../{full => quick}/cast/IsReified.jet | 0 .../{full => quick}/cast/IsTraits.jet | 0 .../cast/WhenErasedDisallowFromAny.jet | 2 + .../{full => quick}/infos/Autocasts.jet | 0 .../infos/PropertiesWithBackingFields.jet | 0 .../{full => quick}/kt600.jet | 3 +- .../AmbiguityOnLazyTypeComputation.jet | 0 .../regression/AssignmentsUnderOperators.jet | 0 .../regression/CoercionToUnit.jet | 0 .../regression/DoubleDefine.jet | 4 +- .../ErrorsOnIbjectExpressionsAsParameters.jet | 0 .../{full => quick}/regression/Jet11.jet | 0 .../{full => quick}/regression/Jet121.jet | 0 .../{full => quick}/regression/Jet124.jet | 0 .../{full => quick}/regression/Jet169.jet | 0 .../{full => quick}/regression/Jet17.jet | 0 .../{full => quick}/regression/Jet183-1.jet | 0 .../{full => quick}/regression/Jet183.jet | 0 .../quick/regression/Jet53.jet | 6 + .../{full => quick}/regression/Jet67.jet | 0 .../{full => quick}/regression/Jet68.jet | 0 .../{full => quick}/regression/Jet69.jet | 0 .../{full => quick}/regression/Jet72.jet | 1 + .../{full => quick}/regression/Jet81.jet | 0 .../regression/OverrideResolution.jet | 0 .../ScopeForSecondaryConstructors.jet | 0 .../regression/SpecififcityByReceiver.jet | 0 .../ThisConstructorInGenericClass.jet | 0 .../regression/WrongTraceInCallResolver.jet | 0 .../{full => quick}/regression/kt251.jet | 0 .../{full => quick}/regression/kt258.jet | 1 + .../{full => quick}/regression/kt287.jet | 2 + .../{full => quick}/regression/kt303.jet | 0 .../{full => quick}/regression/kt313.jet | 1 + .../{full => quick}/regression/kt335.336.jet | 1 + .../regression/kt385.109.441.jet | 3 +- .../{full => quick}/regression/kt402.jet | 0 .../{full => quick}/regression/kt459.jet | 3 +- .../{full => quick}/regression/kt469.jet | 2 + .../{full => quick}/regression/kt549.jet | 2 + .../{full => quick}/regression/kt58.jet | 3 +- .../{full => quick}/regression/kt580.jet | 4 +- .../{full => quick}/regression/kt588.jet | 4 +- .../quick/regressions/kt235.jet | 3 +- .../jet/checkers/FullJetPsiCheckerTest.java | 119 ------------------ 100 files changed, 92 insertions(+), 141 deletions(-) delete mode 100644 compiler/testData/checkerWithErrorTypes/full/regression/Jet53.jet rename compiler/testData/checkerWithErrorTypes/{full => quick}/Abstract.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/AnonymousInitializers.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/BinaryCallsOnNullableValues.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Bounds.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/BreakContinue.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Builders.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Casts.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ClassObjects.jet (97%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Constants.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Constructors.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/CovariantOverrideType.jet (98%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/CyclicHierarchy.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Enums.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ExtensionFunctions.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ForRangeConventions.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/FunctionReturnTypes.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/GenericArgumentConsistency.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/IllegalModifiers.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/IncDec.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/IsExpressions.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/MultipleBounds.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/NamespaceAsExpression.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/NamespaceInExpressionPosition.jet (97%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/NamespaceQualified.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Nullability.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Objects.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/PrimaryConstructors.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ProjectionsInSupertypes.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Properties.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/QualifiedExpressions.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/QualifiedThis.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/RecursiveTypeInference.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Redeclarations.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ResolveOfJavaGenerics.jet (96%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ResolveToJava.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Return.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/StringTemplates.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/SupertypeListChecks.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/TraitSupertypeList.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/UnreachableCode.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Unresolved.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/ValAndFunOverrideCompatibilityClash.jet (93%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/VarargTypes.jet (98%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/Variance.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/When.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/AsErasedError.jet (93%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/AsErasedFine.jet (91%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/AsErasedStar.jet (85%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/AsErasedWarning.jet (89%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/IsErasedAllow.jet (92%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/IsErasedAllowParameterSubtype.jet (93%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/IsErasedDisallowFromAny.jet (90%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/IsErasedStar.jet (85%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/IsReified.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/IsTraits.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/cast/WhenErasedDisallowFromAny.jet (92%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/infos/Autocasts.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/infos/PropertiesWithBackingFields.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/kt600.jet (96%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/AmbiguityOnLazyTypeComputation.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/AssignmentsUnderOperators.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/CoercionToUnit.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/DoubleDefine.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/ErrorsOnIbjectExpressionsAsParameters.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet11.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet121.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet124.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet169.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet17.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet183-1.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet183.jet (100%) create mode 100644 compiler/testData/checkerWithErrorTypes/quick/regression/Jet53.jet rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet67.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet68.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet69.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet72.jet (97%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/Jet81.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/OverrideResolution.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/ScopeForSecondaryConstructors.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/SpecififcityByReceiver.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/ThisConstructorInGenericClass.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/WrongTraceInCallResolver.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt251.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt258.jet (97%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt287.jet (96%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt303.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt313.jet (97%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt335.336.jet (98%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt385.109.441.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt402.jet (100%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt459.jet (92%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt469.jet (98%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt549.jet (97%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt58.jet (99%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt580.jet (90%) rename compiler/testData/checkerWithErrorTypes/{full => quick}/regression/kt588.jet (95%) delete mode 100644 compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet53.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet53.jet deleted file mode 100644 index e880fe25bbd..00000000000 --- a/compiler/testData/checkerWithErrorTypes/full/regression/Jet53.jet +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.Collections -import java.util.List - -val ab = Collections.emptyList() : List? \ No newline at end of file diff --git a/compiler/testData/checkerWithErrorTypes/full/Abstract.jet b/compiler/testData/checkerWithErrorTypes/quick/Abstract.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/Abstract.jet rename to compiler/testData/checkerWithErrorTypes/quick/Abstract.jet index ce355f02045..1ab361db8d8 100644 --- a/compiler/testData/checkerWithErrorTypes/full/Abstract.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/Abstract.jet @@ -1,3 +1,5 @@ +// +JDK + namespace abstract class MyClass() { @@ -238,4 +240,4 @@ abstract class B3(i: Int) { fun foo(a: B3) { val a = B3() val b = B1(2, "s") -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/AnonymousInitializers.jet b/compiler/testData/checkerWithErrorTypes/quick/AnonymousInitializers.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/AnonymousInitializers.jet rename to compiler/testData/checkerWithErrorTypes/quick/AnonymousInitializers.jet diff --git a/compiler/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet b/compiler/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet index 37ff349686f..afd0622ba41 100644 --- a/compiler/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/AutocastsForStableIdentifiers.jet @@ -88,4 +88,4 @@ open class C { t = this@C } } -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/BinaryCallsOnNullableValues.jet b/compiler/testData/checkerWithErrorTypes/quick/BinaryCallsOnNullableValues.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/BinaryCallsOnNullableValues.jet rename to compiler/testData/checkerWithErrorTypes/quick/BinaryCallsOnNullableValues.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/Bounds.jet b/compiler/testData/checkerWithErrorTypes/quick/Bounds.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Bounds.jet rename to compiler/testData/checkerWithErrorTypes/quick/Bounds.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/BreakContinue.jet b/compiler/testData/checkerWithErrorTypes/quick/BreakContinue.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/BreakContinue.jet rename to compiler/testData/checkerWithErrorTypes/quick/BreakContinue.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/Builders.jet b/compiler/testData/checkerWithErrorTypes/quick/Builders.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/Builders.jet rename to compiler/testData/checkerWithErrorTypes/quick/Builders.jet index 1d26cbbc8b2..10791f68875 100644 --- a/compiler/testData/checkerWithErrorTypes/full/Builders.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/Builders.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.* namespace html { diff --git a/compiler/testData/checkerWithErrorTypes/full/Casts.jet b/compiler/testData/checkerWithErrorTypes/quick/Casts.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Casts.jet rename to compiler/testData/checkerWithErrorTypes/quick/Casts.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/ClassObjects.jet b/compiler/testData/checkerWithErrorTypes/quick/ClassObjects.jet similarity index 97% rename from compiler/testData/checkerWithErrorTypes/full/ClassObjects.jet rename to compiler/testData/checkerWithErrorTypes/quick/ClassObjects.jet index 5be76d57e39..f933004a4d5 100644 --- a/compiler/testData/checkerWithErrorTypes/full/ClassObjects.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/ClassObjects.jet @@ -1,3 +1,5 @@ +// +JDK + namespace Jet86 class A { @@ -27,4 +29,4 @@ val s = System // error fun test() { System.out?.println() java.lang.System.out?.println() -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/Constants.jet b/compiler/testData/checkerWithErrorTypes/quick/Constants.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Constants.jet rename to compiler/testData/checkerWithErrorTypes/quick/Constants.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/Constructors.jet b/compiler/testData/checkerWithErrorTypes/quick/Constructors.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Constructors.jet rename to compiler/testData/checkerWithErrorTypes/quick/Constructors.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet b/compiler/testData/checkerWithErrorTypes/quick/CovariantOverrideType.jet similarity index 98% rename from compiler/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet rename to compiler/testData/checkerWithErrorTypes/quick/CovariantOverrideType.jet index 1ffd989245c..ca0116bf983 100644 --- a/compiler/testData/checkerWithErrorTypes/full/CovariantOverrideType.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/CovariantOverrideType.jet @@ -1,3 +1,5 @@ +// +JDK + trait A { fun foo() : Int = 1 fun foo2() : Int = 1 diff --git a/compiler/testData/checkerWithErrorTypes/full/CyclicHierarchy.jet b/compiler/testData/checkerWithErrorTypes/quick/CyclicHierarchy.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/CyclicHierarchy.jet rename to compiler/testData/checkerWithErrorTypes/quick/CyclicHierarchy.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/Enums.jet b/compiler/testData/checkerWithErrorTypes/quick/Enums.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Enums.jet rename to compiler/testData/checkerWithErrorTypes/quick/Enums.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet b/compiler/testData/checkerWithErrorTypes/quick/ExtensionFunctions.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet rename to compiler/testData/checkerWithErrorTypes/quick/ExtensionFunctions.jet index 141e47ae591..245be61e735 100644 --- a/compiler/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/ExtensionFunctions.jet @@ -1,3 +1,5 @@ +// +JDK + fun Int?.optint() : Unit {} val Int?.optval : Unit = () @@ -68,4 +70,4 @@ namespace null_safety { if (command == null) 1 } -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/ForRangeConventions.jet b/compiler/testData/checkerWithErrorTypes/quick/ForRangeConventions.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/ForRangeConventions.jet rename to compiler/testData/checkerWithErrorTypes/quick/ForRangeConventions.jet index 1f14e587fcd..66142d55fbb 100644 --- a/compiler/testData/checkerWithErrorTypes/full/ForRangeConventions.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/ForRangeConventions.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.*; class NotRange1() { diff --git a/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet b/compiler/testData/checkerWithErrorTypes/quick/FunctionReturnTypes.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet rename to compiler/testData/checkerWithErrorTypes/quick/FunctionReturnTypes.jet index 850cb2fd5e0..27d52fb227b 100644 --- a/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/FunctionReturnTypes.jet @@ -1,3 +1,5 @@ +// +JDK + fun none() {} fun unitEmptyInfer() {} @@ -209,4 +211,4 @@ fun testFunctionLiterals() { object A {} } -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/GenericArgumentConsistency.jet b/compiler/testData/checkerWithErrorTypes/quick/GenericArgumentConsistency.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/GenericArgumentConsistency.jet rename to compiler/testData/checkerWithErrorTypes/quick/GenericArgumentConsistency.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/IllegalModifiers.jet b/compiler/testData/checkerWithErrorTypes/quick/IllegalModifiers.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/IllegalModifiers.jet rename to compiler/testData/checkerWithErrorTypes/quick/IllegalModifiers.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/IncDec.jet b/compiler/testData/checkerWithErrorTypes/quick/IncDec.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/IncDec.jet rename to compiler/testData/checkerWithErrorTypes/quick/IncDec.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/IsExpressions.jet b/compiler/testData/checkerWithErrorTypes/quick/IsExpressions.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/IsExpressions.jet rename to compiler/testData/checkerWithErrorTypes/quick/IsExpressions.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/MultipleBounds.jet b/compiler/testData/checkerWithErrorTypes/quick/MultipleBounds.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/MultipleBounds.jet rename to compiler/testData/checkerWithErrorTypes/quick/MultipleBounds.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/NamespaceAsExpression.jet b/compiler/testData/checkerWithErrorTypes/quick/NamespaceAsExpression.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/NamespaceAsExpression.jet rename to compiler/testData/checkerWithErrorTypes/quick/NamespaceAsExpression.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet b/compiler/testData/checkerWithErrorTypes/quick/NamespaceInExpressionPosition.jet similarity index 97% rename from compiler/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet rename to compiler/testData/checkerWithErrorTypes/quick/NamespaceInExpressionPosition.jet index 863f25630cc..f8520b087f1 100644 --- a/compiler/testData/checkerWithErrorTypes/full/NamespaceInExpressionPosition.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/NamespaceInExpressionPosition.jet @@ -1,3 +1,5 @@ +// +JDK + namespace foo class X {} diff --git a/compiler/testData/checkerWithErrorTypes/full/NamespaceQualified.jet b/compiler/testData/checkerWithErrorTypes/quick/NamespaceQualified.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/NamespaceQualified.jet rename to compiler/testData/checkerWithErrorTypes/quick/NamespaceQualified.jet index 213e2867d94..194c1047e24 100644 --- a/compiler/testData/checkerWithErrorTypes/full/NamespaceQualified.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/NamespaceQualified.jet @@ -1,3 +1,5 @@ +// +JDK + namespace foobar namespace a { @@ -60,4 +62,4 @@ abstract class Collection : Iterable { } return iteratee.done() } -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/Nullability.jet b/compiler/testData/checkerWithErrorTypes/quick/Nullability.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/Nullability.jet rename to compiler/testData/checkerWithErrorTypes/quick/Nullability.jet index 8479b364cd8..95e8ebb3700 100644 --- a/compiler/testData/checkerWithErrorTypes/full/Nullability.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/Nullability.jet @@ -1,3 +1,5 @@ +// +JDK + fun test() { val a : Int? = 0 if (a != null) { @@ -277,4 +279,4 @@ fun f9(a : Int?) : Int { if (a != null) return a return 1 -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/Objects.jet b/compiler/testData/checkerWithErrorTypes/quick/Objects.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Objects.jet rename to compiler/testData/checkerWithErrorTypes/quick/Objects.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/PrimaryConstructors.jet b/compiler/testData/checkerWithErrorTypes/quick/PrimaryConstructors.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/PrimaryConstructors.jet rename to compiler/testData/checkerWithErrorTypes/quick/PrimaryConstructors.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/ProjectionsInSupertypes.jet b/compiler/testData/checkerWithErrorTypes/quick/ProjectionsInSupertypes.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/ProjectionsInSupertypes.jet rename to compiler/testData/checkerWithErrorTypes/quick/ProjectionsInSupertypes.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/Properties.jet b/compiler/testData/checkerWithErrorTypes/quick/Properties.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Properties.jet rename to compiler/testData/checkerWithErrorTypes/quick/Properties.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/QualifiedExpressions.jet b/compiler/testData/checkerWithErrorTypes/quick/QualifiedExpressions.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/QualifiedExpressions.jet rename to compiler/testData/checkerWithErrorTypes/quick/QualifiedExpressions.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/QualifiedThis.jet b/compiler/testData/checkerWithErrorTypes/quick/QualifiedThis.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/QualifiedThis.jet rename to compiler/testData/checkerWithErrorTypes/quick/QualifiedThis.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet b/compiler/testData/checkerWithErrorTypes/quick/RecursiveTypeInference.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet rename to compiler/testData/checkerWithErrorTypes/quick/RecursiveTypeInference.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/Redeclarations.jet b/compiler/testData/checkerWithErrorTypes/quick/Redeclarations.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Redeclarations.jet rename to compiler/testData/checkerWithErrorTypes/quick/Redeclarations.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/ResolveOfJavaGenerics.jet b/compiler/testData/checkerWithErrorTypes/quick/ResolveOfJavaGenerics.jet similarity index 96% rename from compiler/testData/checkerWithErrorTypes/full/ResolveOfJavaGenerics.jet rename to compiler/testData/checkerWithErrorTypes/quick/ResolveOfJavaGenerics.jet index d98dd030994..2353e215293 100644 --- a/compiler/testData/checkerWithErrorTypes/full/ResolveOfJavaGenerics.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/ResolveOfJavaGenerics.jet @@ -1,3 +1,5 @@ +// +JDK + // Fixpoint generic in Java: Enum> fun test(a : annotation.RetentionPolicy) { @@ -17,4 +19,4 @@ fun test(a : java.util.ArrayList) { fun test(a : java.lang.Class) { -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/ResolveToJava.jet b/compiler/testData/checkerWithErrorTypes/quick/ResolveToJava.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/ResolveToJava.jet rename to compiler/testData/checkerWithErrorTypes/quick/ResolveToJava.jet index 61483f8ea48..d404b2365ba 100644 --- a/compiler/testData/checkerWithErrorTypes/full/ResolveToJava.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/ResolveToJava.jet @@ -1,3 +1,5 @@ +// +JDK + import java.* import util.* import utils.* @@ -49,4 +51,4 @@ fun test(l : java.util.List) { namespace xxx { import java.lang.Class; -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/Return.jet b/compiler/testData/checkerWithErrorTypes/quick/Return.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Return.jet rename to compiler/testData/checkerWithErrorTypes/quick/Return.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/StringTemplates.jet b/compiler/testData/checkerWithErrorTypes/quick/StringTemplates.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/StringTemplates.jet rename to compiler/testData/checkerWithErrorTypes/quick/StringTemplates.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/SupertypeListChecks.jet b/compiler/testData/checkerWithErrorTypes/quick/SupertypeListChecks.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/SupertypeListChecks.jet rename to compiler/testData/checkerWithErrorTypes/quick/SupertypeListChecks.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/TraitSupertypeList.jet b/compiler/testData/checkerWithErrorTypes/quick/TraitSupertypeList.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/TraitSupertypeList.jet rename to compiler/testData/checkerWithErrorTypes/quick/TraitSupertypeList.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/UnreachableCode.jet b/compiler/testData/checkerWithErrorTypes/quick/UnreachableCode.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/UnreachableCode.jet rename to compiler/testData/checkerWithErrorTypes/quick/UnreachableCode.jet index 60efa628adf..36bfd0e8925 100644 --- a/compiler/testData/checkerWithErrorTypes/full/UnreachableCode.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/UnreachableCode.jet @@ -1,3 +1,5 @@ +// +JDK + fun t1() : Int{ return 0 1 diff --git a/compiler/testData/checkerWithErrorTypes/full/Unresolved.jet b/compiler/testData/checkerWithErrorTypes/quick/Unresolved.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Unresolved.jet rename to compiler/testData/checkerWithErrorTypes/quick/Unresolved.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet b/compiler/testData/checkerWithErrorTypes/quick/ValAndFunOverrideCompatibilityClash.jet similarity index 93% rename from compiler/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet rename to compiler/testData/checkerWithErrorTypes/quick/ValAndFunOverrideCompatibilityClash.jet index f18974bb51f..f493c55a093 100644 --- a/compiler/testData/checkerWithErrorTypes/full/ValAndFunOverrideCompatibilityClash.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/ValAndFunOverrideCompatibilityClash.jet @@ -1,3 +1,5 @@ +// +JDK + class Foo1() : java.util.ArrayList() open class Bar() { diff --git a/compiler/testData/checkerWithErrorTypes/full/VarargTypes.jet b/compiler/testData/checkerWithErrorTypes/quick/VarargTypes.jet similarity index 98% rename from compiler/testData/checkerWithErrorTypes/full/VarargTypes.jet rename to compiler/testData/checkerWithErrorTypes/quick/VarargTypes.jet index 2ce06de117c..d5a3b859b8c 100644 --- a/compiler/testData/checkerWithErrorTypes/full/VarargTypes.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/VarargTypes.jet @@ -1,4 +1,5 @@ // KT-389 Wrong type inference for varargs etc. +// +JDK import java.util.* @@ -23,4 +24,4 @@ fun test() { fool(1, 2, 3) food(1.0, 2.0, 3.0) foof(1.0.flt, 2.0.flt, 3.0.flt) -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/Variance.jet b/compiler/testData/checkerWithErrorTypes/quick/Variance.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/Variance.jet rename to compiler/testData/checkerWithErrorTypes/quick/Variance.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/When.jet b/compiler/testData/checkerWithErrorTypes/quick/When.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/When.jet rename to compiler/testData/checkerWithErrorTypes/quick/When.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedError.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedError.jet similarity index 93% rename from compiler/testData/checkerWithErrorTypes/full/cast/AsErasedError.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedError.jet index bff067d20ee..2b6a8a020d3 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedError.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedError.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; import java.util.Collection; diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedFine.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedFine.jet similarity index 91% rename from compiler/testData/checkerWithErrorTypes/full/cast/AsErasedFine.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedFine.jet index 341f370d108..b4c50dc6b11 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedFine.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedFine.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; import java.util.Collection; diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedStar.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedStar.jet similarity index 85% rename from compiler/testData/checkerWithErrorTypes/full/cast/AsErasedStar.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedStar.jet index b9c2faf0d9a..4217aae11df 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedStar.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedStar.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; fun ff(l: Any) = l as List<*> diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedWarning.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedWarning.jet similarity index 89% rename from compiler/testData/checkerWithErrorTypes/full/cast/AsErasedWarning.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedWarning.jet index a55f6b7d58b..eff6dff6487 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/AsErasedWarning.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/AsErasedWarning.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; fun ff(a: Any) = a as List diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllow.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedAllow.jet similarity index 92% rename from compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllow.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedAllow.jet index 7f32b79eba2..ca46b082bc1 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllow.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedAllow.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.Collection; import java.util.List; diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllowParameterSubtype.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedAllowParameterSubtype.jet similarity index 93% rename from compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllowParameterSubtype.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedAllowParameterSubtype.jet index d1694229dc6..a4d9a515e30 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllowParameterSubtype.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedAllowParameterSubtype.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.Collection; import java.util.List; diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedDisallowFromAny.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedDisallowFromAny.jet similarity index 90% rename from compiler/testData/checkerWithErrorTypes/full/cast/IsErasedDisallowFromAny.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedDisallowFromAny.jet index eb3b402ccc7..76e1b3e530e 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedDisallowFromAny.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedDisallowFromAny.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; fun ff(l: Any) = l is List diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedStar.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedStar.jet similarity index 85% rename from compiler/testData/checkerWithErrorTypes/full/cast/IsErasedStar.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedStar.jet index 404d8f8f3b0..232d2a2f1c9 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/IsErasedStar.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/IsErasedStar.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; fun ff(l: Any) = l is List<*> diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/IsReified.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/IsReified.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/cast/IsReified.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/IsReified.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/IsTraits.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/IsTraits.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/cast/IsTraits.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/IsTraits.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/cast/WhenErasedDisallowFromAny.jet b/compiler/testData/checkerWithErrorTypes/quick/cast/WhenErasedDisallowFromAny.jet similarity index 92% rename from compiler/testData/checkerWithErrorTypes/full/cast/WhenErasedDisallowFromAny.jet rename to compiler/testData/checkerWithErrorTypes/quick/cast/WhenErasedDisallowFromAny.jet index f38a4b14fbe..af0653dd699 100644 --- a/compiler/testData/checkerWithErrorTypes/full/cast/WhenErasedDisallowFromAny.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/cast/WhenErasedDisallowFromAny.jet @@ -1,3 +1,5 @@ +// +JDK + import java.util.List; fun ff(l: Any) = when(l) { diff --git a/compiler/testData/checkerWithErrorTypes/full/infos/Autocasts.jet b/compiler/testData/checkerWithErrorTypes/quick/infos/Autocasts.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/infos/Autocasts.jet rename to compiler/testData/checkerWithErrorTypes/quick/infos/Autocasts.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/infos/PropertiesWithBackingFields.jet b/compiler/testData/checkerWithErrorTypes/quick/infos/PropertiesWithBackingFields.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/infos/PropertiesWithBackingFields.jet rename to compiler/testData/checkerWithErrorTypes/quick/infos/PropertiesWithBackingFields.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/kt600.jet b/compiler/testData/checkerWithErrorTypes/quick/kt600.jet similarity index 96% rename from compiler/testData/checkerWithErrorTypes/full/kt600.jet rename to compiler/testData/checkerWithErrorTypes/quick/kt600.jet index b5734ce9471..6cebda6137c 100644 --- a/compiler/testData/checkerWithErrorTypes/full/kt600.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/kt600.jet @@ -1,8 +1,9 @@ //KT-600 Problem with 'sure' extension function type inference +// +JDK fun T?.sure() : T { if (this != null) return this else throw NullPointerException() } fun test() { val i : Int? = 10 val i2 : Int = i.sure() // inferred type is Int? but Int was excepted -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/AmbiguityOnLazyTypeComputation.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/AmbiguityOnLazyTypeComputation.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/AmbiguityOnLazyTypeComputation.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/AmbiguityOnLazyTypeComputation.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/AssignmentsUnderOperators.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/AssignmentsUnderOperators.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/CoercionToUnit.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/CoercionToUnit.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/CoercionToUnit.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/CoercionToUnit.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/DoubleDefine.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/DoubleDefine.jet index 996c4608778..74da10dc846 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/DoubleDefine.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/DoubleDefine.jet @@ -1,3 +1,5 @@ +// +JDK + import java.* import util.* @@ -63,4 +65,4 @@ fun main(args: Array) { catch(e: Throwable) { System.out?.println(e.getMessage()) } -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/ErrorsOnIbjectExpressionsAsParameters.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/ErrorsOnIbjectExpressionsAsParameters.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/ErrorsOnIbjectExpressionsAsParameters.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/ErrorsOnIbjectExpressionsAsParameters.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet11.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet11.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet11.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet11.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet121.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet121.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet121.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet121.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet124.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet124.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet124.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet124.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet169.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet169.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet169.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet169.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet17.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet17.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet17.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet17.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet183-1.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet183-1.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet183.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet183.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet183.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet183.jet diff --git a/compiler/testData/checkerWithErrorTypes/quick/regression/Jet53.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet53.jet new file mode 100644 index 00000000000..a138884afc2 --- /dev/null +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet53.jet @@ -0,0 +1,6 @@ +// +JDK + +import java.util.Collections +import java.util.List + +val ab = Collections.emptyList() : List? diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet67.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet67.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet67.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet67.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet68.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet68.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet68.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet68.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet69.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet69.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet69.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet69.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet72.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet72.jet similarity index 97% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet72.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet72.jet index d3d3272c8e3..5ca74129847 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/Jet72.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet72.jet @@ -1,4 +1,5 @@ // JET-72 Type inference doesn't work when iterating over ArrayList +// +JDK import java.util.ArrayList diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet81.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/Jet81.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/Jet81.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/Jet81.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/OverrideResolution.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/OverrideResolution.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/OverrideResolution.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/ScopeForSecondaryConstructors.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/ScopeForSecondaryConstructors.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/ScopeForSecondaryConstructors.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/ScopeForSecondaryConstructors.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/SpecififcityByReceiver.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/SpecififcityByReceiver.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/SpecififcityByReceiver.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/SpecififcityByReceiver.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/ThisConstructorInGenericClass.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/ThisConstructorInGenericClass.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/ThisConstructorInGenericClass.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/ThisConstructorInGenericClass.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/WrongTraceInCallResolver.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/WrongTraceInCallResolver.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/WrongTraceInCallResolver.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/WrongTraceInCallResolver.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt251.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt251.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt251.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt251.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt258.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt258.jet similarity index 97% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt258.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt258.jet index 257dfb12378..00b7e9696d4 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt258.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt258.jet @@ -1,4 +1,5 @@ // KT-258 Support equality constraints in type inference +// +JDK import java.util.* diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt287.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt287.jet similarity index 96% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt287.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt287.jet index b0efe2e6460..69d2d526fb0 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt287.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt287.jet @@ -1,4 +1,6 @@ // KT-287 Infer constructor type arguments +// +JDK + import java.util.* fun attributes() : Map = HashMap() // Should be inferred; diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt303.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt303.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt303.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt303.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt313.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt313.jet similarity index 97% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt313.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt313.jet index d22f0dc4f2e..7a112bcb106 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt313.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt313.jet @@ -1,4 +1,5 @@ // KT-313 Bug in substitutions in a function returning its type parameter T +// +JDK fun Iterable.join(separator : String?) : String { return separator.npe() diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt335.336.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt335.336.jet similarity index 98% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt335.336.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt335.336.jet index 46537f0041c..e874d8f005d 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt335.336.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt335.336.jet @@ -1,5 +1,6 @@ // KT-336 Can't infer type parameter for ArrayList in a generic function (Exception in type inference) // KT-335 Type inference fails on Collections.sort +// +JDK import java.util.* import java.lang.Comparable as Comparable diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt385.109.441.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt385.109.441.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt385.109.441.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt385.109.441.jet index 8af621372fd..9dcac990807 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt385.109.441.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt385.109.441.jet @@ -1,6 +1,7 @@ // KT-385 type inference does not work properly` // KT-109 Good code is red: type arguments are not inferred // KT-441 Exception in type inference when multiple overloads accepting an integer literal are accessible +// +JDK import java.util.* @@ -31,4 +32,4 @@ inline fun run(body : fun() : T) : T = body() fun main(args : Array) { println(run { 1 }) -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt402.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt402.jet similarity index 100% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt402.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt402.jet diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt459.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt459.jet similarity index 92% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt459.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt459.jet index e2dd54ef0da..faa62212f38 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt459.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt459.jet @@ -1,8 +1,9 @@ // KT-459 Type argument inference fails when class names are fully qualified +// +JDK fun test() { val attributes : java.util.HashMap = java.util.HashMap() // failure! attributes["href"] = "1" // inference fails, but it shouldn't } -fun java.util.Map.set(key : K, value : V) {}//= this.put(key, value) \ No newline at end of file +fun java.util.Map.set(key : K, value : V) {}//= this.put(key, value) diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt469.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt469.jet similarity index 98% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt469.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt469.jet index 3d01d2efee9..a9ff4c1d291 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt469.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt469.jet @@ -1,3 +1,5 @@ +// +JDK + namespace kt469 //KT-512 plusAssign() : Unit does not work properly diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt549.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt549.jet similarity index 97% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt549.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt549.jet index 9e4725f142e..5fc17be122b 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt549.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt549.jet @@ -1,4 +1,6 @@ //KT-549 type inference failed +// +JDK + namespace demo fun filter(list : Array, filter : fun (T) : Boolean) : java.util.List { diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt58.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt58.jet similarity index 99% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt58.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt58.jet index 7ebe0ee8feb..57562a61f37 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt58.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt58.jet @@ -1,4 +1,5 @@ //KT-58 Allow finally around definite returns +// +JDK namespace kt58 @@ -88,4 +89,4 @@ fun t7() : Int { } fun doSmth(i: Int) { -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt580.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt580.jet similarity index 90% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt580.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt580.jet index d05397ef6e0..a3689acc91d 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt580.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt580.jet @@ -1,4 +1,6 @@ //KT-580 Type inference failed +// +JDK + namespace whats.the.difference import java.util.* @@ -17,4 +19,4 @@ fun main(vals : IntArray) { } fun Array.lastIndex() = size - 1 -val Array.lastIndex : Int get() = size - 1 \ No newline at end of file +val Array.lastIndex : Int get() = size - 1 diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/kt588.jet b/compiler/testData/checkerWithErrorTypes/quick/regression/kt588.jet similarity index 95% rename from compiler/testData/checkerWithErrorTypes/full/regression/kt588.jet rename to compiler/testData/checkerWithErrorTypes/quick/regression/kt588.jet index 2b4b4d86ff4..410c70c3479 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/kt588.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regression/kt588.jet @@ -1,4 +1,6 @@ // KT-588 Unresolved static method +// +JDK + class Test() : Thread("Test") { class object { fun init2() { @@ -9,4 +11,4 @@ class Test() : Thread("Test") { init2() // unresolved Test.init2() // ok } -} \ No newline at end of file +} diff --git a/compiler/testData/checkerWithErrorTypes/quick/regressions/kt235.jet b/compiler/testData/checkerWithErrorTypes/quick/regressions/kt235.jet index 7420cb938e5..33500c845c4 100644 --- a/compiler/testData/checkerWithErrorTypes/quick/regressions/kt235.jet +++ b/compiler/testData/checkerWithErrorTypes/quick/regressions/kt235.jet @@ -1,4 +1,5 @@ //KT-235 Illegal assignment return type +// +JDK namespace kt235 @@ -46,4 +47,4 @@ class MyArray1() { class MyNumber() { fun inc(): MyNumber = MyNumber() -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java b/compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java deleted file mode 100644 index b16946132bf..00000000000 --- a/compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.jetbrains.jet.checkers; - -import com.google.common.collect.Lists; -import com.intellij.openapi.util.TextRange; -import junit.framework.Test; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.ImportingStrategy; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; -import org.jetbrains.jet.lang.resolve.java.JavaDefaultImports; - -import java.util.List; - -/** - * @author abreslav - */ -public class FullJetPsiCheckerTest extends JetLiteFixture { - private final String myDataPath; - private String myName; - - public FullJetPsiCheckerTest(@NonNls String dataPath, String name) { - myDataPath = dataPath; - myName = name; - } - - @Override - public String getName() { - return "test" + myName; - } - - @Override - public void runTest() throws Exception { - String fileName = myName + ".jet"; - String fullPath = myDataPath + "/" + fileName; - - - String expectedText = loadFile(fullPath); - - List diagnosedRanges = Lists.newArrayList(); - String clearText = CheckerTestUtil.parseDiagnosedRanges(expectedText, diagnosedRanges); - - myFile = createPsiFile(myName, clearText); - - boolean importJdk = !expectedText.contains("-JDK"); - ImportingStrategy importingStrategy = importJdk ? JavaDefaultImports.JAVA_DEFAULT_IMPORTS : ImportingStrategy.NONE; - - BindingContext bindingContext = AnalyzerFacade.analyzeFileWithCache(AnalyzingUtils.getInstance(importingStrategy), myFile, AnalyzerFacade.SINGLE_DECLARATION_PROVIDER); - - CheckerTestUtil.diagnosticsDiff(diagnosedRanges, bindingContext.getDiagnostics(), new CheckerTestUtil.DiagnosticDiffCallbacks() { - @Override - public void missingDiagnostic(String type, int expectedStart, int expectedEnd) { - String message = "Missing " + type + DiagnosticUtils.atLocation(myFile, new TextRange(expectedStart, expectedEnd)); - System.err.println(message); - } - - @Override - public void unexpectedDiagnostic(String type, int actualStart, int actualEnd) { - String message = "Unexpected " + type + DiagnosticUtils.atLocation(myFile, new TextRange(actualStart, actualEnd)); - System.err.println(message); - } - }); - - String actualText = CheckerTestUtil.addDiagnosticMarkersToText(myFile, bindingContext).toString(); - - assertEquals(expectedText, actualText); - -// String myFullDataPath = getTestDataPath() + getDataPath(); -// System.out.println("myFullDataPath = " + myFullDataPath); -// convert(new File(myFullDataPath + "/../../checker/"), new File(myFullDataPath)); - } - -/* - private void convert(File src, File dest) throws IOException { - File[] files = src.listFiles(); - for (File file : files) { - try { - if (file.isDirectory()) { - File destDir = new File(dest, file.getName()); - destDir.mkdir(); - convert(file, destDir); - continue; - } - if (!file.getName().endsWith(".jet")) continue; - String text = loadFile(file.getAbsolutePath()); - Pattern pattern = Pattern.compile(""); - String clearText = pattern.matcher(text).replaceAll(""); - - configureFromFileText(file.getName(), clearText); - - BindingContext bindingContext = AnalyzerFacade.analyzeFileWithCache((JetFile) myFile); - String expectedText = CheckerTestUtil.addDiagnosticMarkersToText(myFile, bindingContext).toString(); - - File destFile = new File(dest, file.getName()); - FileWriter fileWriter = new FileWriter(destFile); - fileWriter.write(expectedText); - fileWriter.close(); - } - catch (RuntimeException e) { - e.printStackTrace(); - } - } - } -*/ - - public static Test suite() { - return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/checkerWithErrorTypes/full/", true, new JetTestCaseBuilder.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String dataPath, @NotNull String name) { - return new FullJetPsiCheckerTest(dataPath, name); - } - }); - } -}