diff --git a/compiler/testData/psi/AnnotatedExpressions.jet b/compiler/testData/psi/AnnotatedExpressions.kt similarity index 100% rename from compiler/testData/psi/AnnotatedExpressions.jet rename to compiler/testData/psi/AnnotatedExpressions.kt diff --git a/compiler/testData/psi/AnnotatedExpressions.txt b/compiler/testData/psi/AnnotatedExpressions.txt index 3c6c46dd0a5..adb16a4dfa1 100644 --- a/compiler/testData/psi/AnnotatedExpressions.txt +++ b/compiler/testData/psi/AnnotatedExpressions.txt @@ -1,4 +1,4 @@ -JetFile: AnnotatedExpressions.jet +JetFile: AnnotatedExpressions.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/AnonymousInitializer.jet b/compiler/testData/psi/AnonymousInitializer.kt similarity index 100% rename from compiler/testData/psi/AnonymousInitializer.jet rename to compiler/testData/psi/AnonymousInitializer.kt diff --git a/compiler/testData/psi/AnonymousInitializer.txt b/compiler/testData/psi/AnonymousInitializer.txt index e61e430a7f7..ec8593cb67b 100644 --- a/compiler/testData/psi/AnonymousInitializer.txt +++ b/compiler/testData/psi/AnonymousInitializer.txt @@ -1,4 +1,4 @@ -JetFile: AnonymousInitializer.jet +JetFile: AnonymousInitializer.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/AssertNotNull.jet b/compiler/testData/psi/AssertNotNull.kt similarity index 100% rename from compiler/testData/psi/AssertNotNull.jet rename to compiler/testData/psi/AssertNotNull.kt diff --git a/compiler/testData/psi/AssertNotNull.txt b/compiler/testData/psi/AssertNotNull.txt index 7a3090f1232..60dc64455fd 100644 --- a/compiler/testData/psi/AssertNotNull.txt +++ b/compiler/testData/psi/AssertNotNull.txt @@ -1,4 +1,4 @@ -JetFile: AssertNotNull.jet +JetFile: AssertNotNull.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/Attributes.jet b/compiler/testData/psi/Attributes.kt similarity index 100% rename from compiler/testData/psi/Attributes.jet rename to compiler/testData/psi/Attributes.kt diff --git a/compiler/testData/psi/Attributes.txt b/compiler/testData/psi/Attributes.txt index 1a0fa9be2a8..9d9344c0a00 100644 --- a/compiler/testData/psi/Attributes.txt +++ b/compiler/testData/psi/Attributes.txt @@ -1,4 +1,4 @@ -JetFile: Attributes.jet +JetFile: Attributes.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/AttributesOnPatterns.jet b/compiler/testData/psi/AttributesOnPatterns.kt similarity index 100% rename from compiler/testData/psi/AttributesOnPatterns.jet rename to compiler/testData/psi/AttributesOnPatterns.kt diff --git a/compiler/testData/psi/AttributesOnPatterns.txt b/compiler/testData/psi/AttributesOnPatterns.txt index 3c963e0566f..4314b046837 100644 --- a/compiler/testData/psi/AttributesOnPatterns.txt +++ b/compiler/testData/psi/AttributesOnPatterns.txt @@ -1,4 +1,4 @@ -JetFile: AttributesOnPatterns.jet +JetFile: AttributesOnPatterns.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/Attributes_ERR.jet b/compiler/testData/psi/Attributes_ERR.kt similarity index 100% rename from compiler/testData/psi/Attributes_ERR.jet rename to compiler/testData/psi/Attributes_ERR.kt diff --git a/compiler/testData/psi/Attributes_ERR.txt b/compiler/testData/psi/Attributes_ERR.txt index aa8508f26f0..1bc34c4321f 100644 --- a/compiler/testData/psi/Attributes_ERR.txt +++ b/compiler/testData/psi/Attributes_ERR.txt @@ -1,4 +1,4 @@ -JetFile: Attributes_ERR.jet +JetFile: Attributes_ERR.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/BabySteps.jet b/compiler/testData/psi/BabySteps.kt similarity index 100% rename from compiler/testData/psi/BabySteps.jet rename to compiler/testData/psi/BabySteps.kt diff --git a/compiler/testData/psi/BabySteps.txt b/compiler/testData/psi/BabySteps.txt index 216cd2aedbd..9720a71f6bc 100644 --- a/compiler/testData/psi/BabySteps.txt +++ b/compiler/testData/psi/BabySteps.txt @@ -1,4 +1,4 @@ -JetFile: BabySteps.jet +JetFile: BabySteps.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/BabySteps_ERR.jet b/compiler/testData/psi/BabySteps_ERR.kt similarity index 100% rename from compiler/testData/psi/BabySteps_ERR.jet rename to compiler/testData/psi/BabySteps_ERR.kt diff --git a/compiler/testData/psi/BabySteps_ERR.txt b/compiler/testData/psi/BabySteps_ERR.txt index d70cb5d91d8..46530657e20 100644 --- a/compiler/testData/psi/BabySteps_ERR.txt +++ b/compiler/testData/psi/BabySteps_ERR.txt @@ -1,4 +1,4 @@ -JetFile: BabySteps_ERR.jet +JetFile: BabySteps_ERR.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.jet b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt similarity index 100% rename from compiler/testData/psi/BlockCommentAtBeginningOfFile1.jet rename to compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt index caa38bde685..941c1774096 100644 --- a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt +++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt @@ -1,4 +1,4 @@ -JetFile: BlockCommentAtBeginningOfFile1.jet +JetFile: BlockCommentAtBeginningOfFile1.kt PsiComment(BLOCK_COMMENT)('/*') NAMESPACE_HEADER \ No newline at end of file diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.jet b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt similarity index 100% rename from compiler/testData/psi/BlockCommentAtBeginningOfFile2.jet rename to compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt index 44c693c5596..fbfe2cb645f 100644 --- a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt +++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt @@ -1,4 +1,4 @@ -JetFile: BlockCommentAtBeginningOfFile2.jet +JetFile: BlockCommentAtBeginningOfFile2.kt PsiComment(BLOCK_COMMENT)('/*\n/*') NAMESPACE_HEADER \ No newline at end of file diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.jet b/compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt similarity index 100% rename from compiler/testData/psi/BlockCommentAtBeginningOfFile3.jet rename to compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt index 57e41e65171..18f6d1f60f7 100644 --- a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt +++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt @@ -1,4 +1,4 @@ -JetFile: BlockCommentAtBeginningOfFile3.jet +JetFile: BlockCommentAtBeginningOfFile3.kt PsiComment(BLOCK_COMMENT)('/*\n\nfooo') NAMESPACE_HEADER \ No newline at end of file diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.jet b/compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt similarity index 100% rename from compiler/testData/psi/BlockCommentAtBeginningOfFile4.jet rename to compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt index 7ca748707c9..c170e65c6ea 100644 --- a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt +++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt @@ -1,4 +1,4 @@ -JetFile: BlockCommentAtBeginningOfFile4.jet +JetFile: BlockCommentAtBeginningOfFile4.kt PsiComment(BLOCK_COMMENT)('/*\n\n/*foo*/\n\nasdfas') NAMESPACE_HEADER \ No newline at end of file diff --git a/compiler/testData/psi/ByCaluses.jet b/compiler/testData/psi/ByCaluses.kt similarity index 100% rename from compiler/testData/psi/ByCaluses.jet rename to compiler/testData/psi/ByCaluses.kt diff --git a/compiler/testData/psi/ByCaluses.txt b/compiler/testData/psi/ByCaluses.txt index 8a52f11ee5b..49d33d39994 100644 --- a/compiler/testData/psi/ByCaluses.txt +++ b/compiler/testData/psi/ByCaluses.txt @@ -1,4 +1,4 @@ -JetFile: ByCaluses.jet +JetFile: ByCaluses.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/CallWithManyClosures.jet b/compiler/testData/psi/CallWithManyClosures.kt similarity index 100% rename from compiler/testData/psi/CallWithManyClosures.jet rename to compiler/testData/psi/CallWithManyClosures.kt diff --git a/compiler/testData/psi/CallWithManyClosures.txt b/compiler/testData/psi/CallWithManyClosures.txt index 4fa8128e036..4f1eecc6b57 100644 --- a/compiler/testData/psi/CallWithManyClosures.txt +++ b/compiler/testData/psi/CallWithManyClosures.txt @@ -1,4 +1,4 @@ -JetFile: CallWithManyClosures.jet +JetFile: CallWithManyClosures.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/CallsInWhen.jet b/compiler/testData/psi/CallsInWhen.kt similarity index 100% rename from compiler/testData/psi/CallsInWhen.jet rename to compiler/testData/psi/CallsInWhen.kt diff --git a/compiler/testData/psi/CallsInWhen.txt b/compiler/testData/psi/CallsInWhen.txt index c752a2aea22..6dbefaa681f 100644 --- a/compiler/testData/psi/CallsInWhen.txt +++ b/compiler/testData/psi/CallsInWhen.txt @@ -1,4 +1,4 @@ -JetFile: CallsInWhen.jet +JetFile: CallsInWhen.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/Constructors.jet b/compiler/testData/psi/Constructors.kt similarity index 100% rename from compiler/testData/psi/Constructors.jet rename to compiler/testData/psi/Constructors.kt diff --git a/compiler/testData/psi/Constructors.txt b/compiler/testData/psi/Constructors.txt index 70af2dbc4b3..51820feb086 100644 --- a/compiler/testData/psi/Constructors.txt +++ b/compiler/testData/psi/Constructors.txt @@ -1,4 +1,4 @@ -JetFile: Constructors.jet +JetFile: Constructors.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/ControlStructures.jet b/compiler/testData/psi/ControlStructures.kt similarity index 100% rename from compiler/testData/psi/ControlStructures.jet rename to compiler/testData/psi/ControlStructures.kt diff --git a/compiler/testData/psi/ControlStructures.txt b/compiler/testData/psi/ControlStructures.txt index 04a121bde77..da92a50e321 100644 --- a/compiler/testData/psi/ControlStructures.txt +++ b/compiler/testData/psi/ControlStructures.txt @@ -1,4 +1,4 @@ -JetFile: ControlStructures.jet +JetFile: ControlStructures.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/DoubleColon.jet b/compiler/testData/psi/DoubleColon.kt similarity index 100% rename from compiler/testData/psi/DoubleColon.jet rename to compiler/testData/psi/DoubleColon.kt diff --git a/compiler/testData/psi/DoubleColon.txt b/compiler/testData/psi/DoubleColon.txt index f4b20260a2d..7e2d2af2c96 100644 --- a/compiler/testData/psi/DoubleColon.txt +++ b/compiler/testData/psi/DoubleColon.txt @@ -1,4 +1,4 @@ -JetFile: DoubleColon.jet +JetFile: DoubleColon.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/EOLsInComments.jet b/compiler/testData/psi/EOLsInComments.kt similarity index 100% rename from compiler/testData/psi/EOLsInComments.jet rename to compiler/testData/psi/EOLsInComments.kt diff --git a/compiler/testData/psi/EOLsInComments.txt b/compiler/testData/psi/EOLsInComments.txt index 5102fdb525f..6985a3e298b 100644 --- a/compiler/testData/psi/EOLsInComments.txt +++ b/compiler/testData/psi/EOLsInComments.txt @@ -1,4 +1,4 @@ -JetFile: EOLsInComments.jet +JetFile: EOLsInComments.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/EOLsOnRollback.jet b/compiler/testData/psi/EOLsOnRollback.kt similarity index 100% rename from compiler/testData/psi/EOLsOnRollback.jet rename to compiler/testData/psi/EOLsOnRollback.kt diff --git a/compiler/testData/psi/EOLsOnRollback.txt b/compiler/testData/psi/EOLsOnRollback.txt index c42e583c425..5525c2c976a 100644 --- a/compiler/testData/psi/EOLsOnRollback.txt +++ b/compiler/testData/psi/EOLsOnRollback.txt @@ -1,4 +1,4 @@ -JetFile: EOLsOnRollback.jet +JetFile: EOLsOnRollback.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/EmptyFile.jet b/compiler/testData/psi/EmptyFile.kt similarity index 100% rename from compiler/testData/psi/EmptyFile.jet rename to compiler/testData/psi/EmptyFile.kt diff --git a/compiler/testData/psi/EmptyFile.txt b/compiler/testData/psi/EmptyFile.txt index eaddc739910..20f0592432e 100644 --- a/compiler/testData/psi/EmptyFile.txt +++ b/compiler/testData/psi/EmptyFile.txt @@ -1,3 +1,3 @@ -JetFile: EmptyFile.jet +JetFile: EmptyFile.kt NAMESPACE_HEADER \ No newline at end of file diff --git a/compiler/testData/psi/Enums.jet b/compiler/testData/psi/Enums.kt similarity index 100% rename from compiler/testData/psi/Enums.jet rename to compiler/testData/psi/Enums.kt diff --git a/compiler/testData/psi/Enums.txt b/compiler/testData/psi/Enums.txt index 5ac8adb5a37..17be41520f7 100644 --- a/compiler/testData/psi/Enums.txt +++ b/compiler/testData/psi/Enums.txt @@ -1,4 +1,4 @@ -JetFile: Enums.jet +JetFile: Enums.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/Expressions_ERR.jet b/compiler/testData/psi/Expressions_ERR.kt similarity index 100% rename from compiler/testData/psi/Expressions_ERR.jet rename to compiler/testData/psi/Expressions_ERR.kt diff --git a/compiler/testData/psi/Expressions_ERR.txt b/compiler/testData/psi/Expressions_ERR.txt index 56f14f20935..b99b1448ddf 100644 --- a/compiler/testData/psi/Expressions_ERR.txt +++ b/compiler/testData/psi/Expressions_ERR.txt @@ -1,4 +1,4 @@ -JetFile: Expressions_ERR.jet +JetFile: Expressions_ERR.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/ExtensionsWithQNReceiver.jet b/compiler/testData/psi/ExtensionsWithQNReceiver.kt similarity index 100% rename from compiler/testData/psi/ExtensionsWithQNReceiver.jet rename to compiler/testData/psi/ExtensionsWithQNReceiver.kt diff --git a/compiler/testData/psi/ExtensionsWithQNReceiver.txt b/compiler/testData/psi/ExtensionsWithQNReceiver.txt index 95901f7809b..76c8445b6f9 100644 --- a/compiler/testData/psi/ExtensionsWithQNReceiver.txt +++ b/compiler/testData/psi/ExtensionsWithQNReceiver.txt @@ -1,4 +1,4 @@ -JetFile: ExtensionsWithQNReceiver.jet +JetFile: ExtensionsWithQNReceiver.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/FileStart_ERR.jet b/compiler/testData/psi/FileStart_ERR.kt similarity index 100% rename from compiler/testData/psi/FileStart_ERR.jet rename to compiler/testData/psi/FileStart_ERR.kt diff --git a/compiler/testData/psi/FileStart_ERR.txt b/compiler/testData/psi/FileStart_ERR.txt index fe469cd014b..d99d89b6a80 100644 --- a/compiler/testData/psi/FileStart_ERR.txt +++ b/compiler/testData/psi/FileStart_ERR.txt @@ -1,4 +1,4 @@ -JetFile: FileStart_ERR.jet +JetFile: FileStart_ERR.kt NAMESPACE_HEADER PsiErrorElement:Expecting package directive or top level declaration diff --git a/compiler/testData/psi/ForWithMultiDecl.jet b/compiler/testData/psi/ForWithMultiDecl.kt similarity index 100% rename from compiler/testData/psi/ForWithMultiDecl.jet rename to compiler/testData/psi/ForWithMultiDecl.kt diff --git a/compiler/testData/psi/ForWithMultiDecl.txt b/compiler/testData/psi/ForWithMultiDecl.txt index aa787f0df18..1eec409161d 100644 --- a/compiler/testData/psi/ForWithMultiDecl.txt +++ b/compiler/testData/psi/ForWithMultiDecl.txt @@ -1,4 +1,4 @@ -JetFile: ForWithMultiDecl.jet +JetFile: ForWithMultiDecl.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/FunctionCalls.jet b/compiler/testData/psi/FunctionCalls.kt similarity index 100% rename from compiler/testData/psi/FunctionCalls.jet rename to compiler/testData/psi/FunctionCalls.kt diff --git a/compiler/testData/psi/FunctionCalls.txt b/compiler/testData/psi/FunctionCalls.txt index 8c1474f3b47..8afc1b4d80b 100644 --- a/compiler/testData/psi/FunctionCalls.txt +++ b/compiler/testData/psi/FunctionCalls.txt @@ -1,4 +1,4 @@ -JetFile: FunctionCalls.jet +JetFile: FunctionCalls.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/FunctionLiterals.jet b/compiler/testData/psi/FunctionLiterals.kt similarity index 100% rename from compiler/testData/psi/FunctionLiterals.jet rename to compiler/testData/psi/FunctionLiterals.kt diff --git a/compiler/testData/psi/FunctionLiterals.txt b/compiler/testData/psi/FunctionLiterals.txt index 54831c53a0d..3ec109d09bf 100644 --- a/compiler/testData/psi/FunctionLiterals.txt +++ b/compiler/testData/psi/FunctionLiterals.txt @@ -1,4 +1,4 @@ -JetFile: FunctionLiterals.jet +JetFile: FunctionLiterals.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/FunctionLiterals_ERR.jet b/compiler/testData/psi/FunctionLiterals_ERR.kt similarity index 100% rename from compiler/testData/psi/FunctionLiterals_ERR.jet rename to compiler/testData/psi/FunctionLiterals_ERR.kt diff --git a/compiler/testData/psi/FunctionLiterals_ERR.txt b/compiler/testData/psi/FunctionLiterals_ERR.txt index 3f4b7b3bb28..b5b864e13cd 100644 --- a/compiler/testData/psi/FunctionLiterals_ERR.txt +++ b/compiler/testData/psi/FunctionLiterals_ERR.txt @@ -1,4 +1,4 @@ -JetFile: FunctionLiterals_ERR.jet +JetFile: FunctionLiterals_ERR.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/FunctionTypes.jet b/compiler/testData/psi/FunctionTypes.kt similarity index 100% rename from compiler/testData/psi/FunctionTypes.jet rename to compiler/testData/psi/FunctionTypes.kt diff --git a/compiler/testData/psi/FunctionTypes.txt b/compiler/testData/psi/FunctionTypes.txt index 3fadc731911..6a372626aee 100644 --- a/compiler/testData/psi/FunctionTypes.txt +++ b/compiler/testData/psi/FunctionTypes.txt @@ -1,4 +1,4 @@ -JetFile: FunctionTypes.jet +JetFile: FunctionTypes.kt NAMESPACE_HEADER TYPEDEF diff --git a/compiler/testData/psi/FunctionTypes_ERR.jet b/compiler/testData/psi/FunctionTypes_ERR.kt similarity index 100% rename from compiler/testData/psi/FunctionTypes_ERR.jet rename to compiler/testData/psi/FunctionTypes_ERR.kt diff --git a/compiler/testData/psi/FunctionTypes_ERR.txt b/compiler/testData/psi/FunctionTypes_ERR.txt index c5b5ab4682d..ff16ddbef7e 100644 --- a/compiler/testData/psi/FunctionTypes_ERR.txt +++ b/compiler/testData/psi/FunctionTypes_ERR.txt @@ -1,4 +1,4 @@ -JetFile: FunctionTypes_ERR.jet +JetFile: FunctionTypes_ERR.kt NAMESPACE_HEADER TYPEDEF diff --git a/compiler/testData/psi/Functions.jet b/compiler/testData/psi/Functions.kt similarity index 100% rename from compiler/testData/psi/Functions.jet rename to compiler/testData/psi/Functions.kt diff --git a/compiler/testData/psi/Functions.txt b/compiler/testData/psi/Functions.txt index 55b87df521d..5cd53d9dead 100644 --- a/compiler/testData/psi/Functions.txt +++ b/compiler/testData/psi/Functions.txt @@ -1,4 +1,4 @@ -JetFile: Functions.jet +JetFile: Functions.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/Functions_ERR.jet b/compiler/testData/psi/Functions_ERR.kt similarity index 100% rename from compiler/testData/psi/Functions_ERR.jet rename to compiler/testData/psi/Functions_ERR.kt diff --git a/compiler/testData/psi/Functions_ERR.txt b/compiler/testData/psi/Functions_ERR.txt index cc181ad3f01..ca9af621084 100644 --- a/compiler/testData/psi/Functions_ERR.txt +++ b/compiler/testData/psi/Functions_ERR.txt @@ -1,4 +1,4 @@ -JetFile: Functions_ERR.jet +JetFile: Functions_ERR.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/HangOnLonelyModifier.jet b/compiler/testData/psi/HangOnLonelyModifier.kt similarity index 100% rename from compiler/testData/psi/HangOnLonelyModifier.jet rename to compiler/testData/psi/HangOnLonelyModifier.kt diff --git a/compiler/testData/psi/HangOnLonelyModifier.txt b/compiler/testData/psi/HangOnLonelyModifier.txt index 5cb15f32d43..291aec92a15 100644 --- a/compiler/testData/psi/HangOnLonelyModifier.txt +++ b/compiler/testData/psi/HangOnLonelyModifier.txt @@ -1,4 +1,4 @@ -JetFile: HangOnLonelyModifier.jet +JetFile: HangOnLonelyModifier.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/IfWithPropery.jet b/compiler/testData/psi/IfWithPropery.kt similarity index 100% rename from compiler/testData/psi/IfWithPropery.jet rename to compiler/testData/psi/IfWithPropery.kt diff --git a/compiler/testData/psi/IfWithPropery.txt b/compiler/testData/psi/IfWithPropery.txt index 3989e1ca6f2..2b66ca94918 100644 --- a/compiler/testData/psi/IfWithPropery.txt +++ b/compiler/testData/psi/IfWithPropery.txt @@ -1,4 +1,4 @@ -JetFile: IfWithPropery.jet +JetFile: IfWithPropery.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/ImportSoftKW.jet b/compiler/testData/psi/ImportSoftKW.kt similarity index 100% rename from compiler/testData/psi/ImportSoftKW.jet rename to compiler/testData/psi/ImportSoftKW.kt diff --git a/compiler/testData/psi/ImportSoftKW.txt b/compiler/testData/psi/ImportSoftKW.txt index 496c38d360f..2ea08bc2cf1 100644 --- a/compiler/testData/psi/ImportSoftKW.txt +++ b/compiler/testData/psi/ImportSoftKW.txt @@ -1,4 +1,4 @@ -JetFile: ImportSoftKW.jet +JetFile: ImportSoftKW.kt NAMESPACE_HEADER IMPORT_DIRECTIVE diff --git a/compiler/testData/psi/Imports.jet b/compiler/testData/psi/Imports.kt similarity index 100% rename from compiler/testData/psi/Imports.jet rename to compiler/testData/psi/Imports.kt diff --git a/compiler/testData/psi/Imports.txt b/compiler/testData/psi/Imports.txt index dfa9448aa00..47b104ff320 100644 --- a/compiler/testData/psi/Imports.txt +++ b/compiler/testData/psi/Imports.txt @@ -1,4 +1,4 @@ -JetFile: Imports.jet +JetFile: Imports.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/Imports_ERR.jet b/compiler/testData/psi/Imports_ERR.kt similarity index 100% rename from compiler/testData/psi/Imports_ERR.jet rename to compiler/testData/psi/Imports_ERR.kt diff --git a/compiler/testData/psi/Imports_ERR.txt b/compiler/testData/psi/Imports_ERR.txt index 9406df03bb6..247260c3900 100644 --- a/compiler/testData/psi/Imports_ERR.txt +++ b/compiler/testData/psi/Imports_ERR.txt @@ -1,4 +1,4 @@ -JetFile: Imports_ERR.jet +JetFile: Imports_ERR.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/Inner.jet b/compiler/testData/psi/Inner.kt similarity index 100% rename from compiler/testData/psi/Inner.jet rename to compiler/testData/psi/Inner.kt diff --git a/compiler/testData/psi/Inner.txt b/compiler/testData/psi/Inner.txt index 9b551a6c180..4dfe045fcc0 100644 --- a/compiler/testData/psi/Inner.txt +++ b/compiler/testData/psi/Inner.txt @@ -1,4 +1,4 @@ -JetFile: Inner.jet +JetFile: Inner.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/Labels.jet b/compiler/testData/psi/Labels.kt similarity index 100% rename from compiler/testData/psi/Labels.jet rename to compiler/testData/psi/Labels.kt diff --git a/compiler/testData/psi/Labels.txt b/compiler/testData/psi/Labels.txt index 4109a6d55cc..fe06595516d 100644 --- a/compiler/testData/psi/Labels.txt +++ b/compiler/testData/psi/Labels.txt @@ -1,4 +1,4 @@ -JetFile: Labels.jet +JetFile: Labels.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/LocalDeclarations.jet b/compiler/testData/psi/LocalDeclarations.kt similarity index 100% rename from compiler/testData/psi/LocalDeclarations.jet rename to compiler/testData/psi/LocalDeclarations.kt diff --git a/compiler/testData/psi/LocalDeclarations.txt b/compiler/testData/psi/LocalDeclarations.txt index 43691d7d76d..33dbbe95410 100644 --- a/compiler/testData/psi/LocalDeclarations.txt +++ b/compiler/testData/psi/LocalDeclarations.txt @@ -1,4 +1,4 @@ -JetFile: LocalDeclarations.jet +JetFile: LocalDeclarations.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/ModifierAsSelector.jet b/compiler/testData/psi/ModifierAsSelector.kt similarity index 100% rename from compiler/testData/psi/ModifierAsSelector.jet rename to compiler/testData/psi/ModifierAsSelector.kt diff --git a/compiler/testData/psi/ModifierAsSelector.txt b/compiler/testData/psi/ModifierAsSelector.txt index 822b3d9113e..3f4b9e04286 100644 --- a/compiler/testData/psi/ModifierAsSelector.txt +++ b/compiler/testData/psi/ModifierAsSelector.txt @@ -1,4 +1,4 @@ -JetFile: ModifierAsSelector.jet +JetFile: ModifierAsSelector.kt PsiComment(EOL_COMMENT)('// JET-1') PsiWhiteSpace('\n\n') NAMESPACE_HEADER diff --git a/compiler/testData/psi/MultiVariableDeclarations.jet b/compiler/testData/psi/MultiVariableDeclarations.kt similarity index 100% rename from compiler/testData/psi/MultiVariableDeclarations.jet rename to compiler/testData/psi/MultiVariableDeclarations.kt diff --git a/compiler/testData/psi/MultiVariableDeclarations.txt b/compiler/testData/psi/MultiVariableDeclarations.txt index 055de08ef08..afebab1edb1 100644 --- a/compiler/testData/psi/MultiVariableDeclarations.txt +++ b/compiler/testData/psi/MultiVariableDeclarations.txt @@ -1,4 +1,4 @@ -JetFile: MultiVariableDeclarations.jet +JetFile: MultiVariableDeclarations.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/NamespaceBlockFirst.jet b/compiler/testData/psi/NamespaceBlockFirst.kt similarity index 100% rename from compiler/testData/psi/NamespaceBlockFirst.jet rename to compiler/testData/psi/NamespaceBlockFirst.kt diff --git a/compiler/testData/psi/NamespaceBlockFirst.txt b/compiler/testData/psi/NamespaceBlockFirst.txt index ee2e8d110aa..9c7c46e2a97 100644 --- a/compiler/testData/psi/NamespaceBlockFirst.txt +++ b/compiler/testData/psi/NamespaceBlockFirst.txt @@ -1,4 +1,4 @@ -JetFile: NamespaceBlockFirst.jet +JetFile: NamespaceBlockFirst.kt NAMESPACE_HEADER PsiErrorElement:Expecting package directive or top level declaration diff --git a/compiler/testData/psi/NamespaceModifiers.jet b/compiler/testData/psi/NamespaceModifiers.kt similarity index 100% rename from compiler/testData/psi/NamespaceModifiers.jet rename to compiler/testData/psi/NamespaceModifiers.kt diff --git a/compiler/testData/psi/NamespaceModifiers.txt b/compiler/testData/psi/NamespaceModifiers.txt index 5b919c6eb15..0935f76b83b 100644 --- a/compiler/testData/psi/NamespaceModifiers.txt +++ b/compiler/testData/psi/NamespaceModifiers.txt @@ -1,4 +1,4 @@ -JetFile: NamespaceModifiers.jet +JetFile: NamespaceModifiers.kt NAMESPACE_HEADER MODIFIER_LIST PsiElement(public)('public') diff --git a/compiler/testData/psi/NestedComments.jet b/compiler/testData/psi/NestedComments.kt similarity index 100% rename from compiler/testData/psi/NestedComments.jet rename to compiler/testData/psi/NestedComments.kt diff --git a/compiler/testData/psi/NestedComments.txt b/compiler/testData/psi/NestedComments.txt index 029c4c6d5dd..d629dfa0747 100644 --- a/compiler/testData/psi/NestedComments.txt +++ b/compiler/testData/psi/NestedComments.txt @@ -1,4 +1,4 @@ -JetFile: NestedComments.jet +JetFile: NestedComments.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/NewLinesValidOperations.jet b/compiler/testData/psi/NewLinesValidOperations.kt similarity index 100% rename from compiler/testData/psi/NewLinesValidOperations.jet rename to compiler/testData/psi/NewLinesValidOperations.kt diff --git a/compiler/testData/psi/NewLinesValidOperations.txt b/compiler/testData/psi/NewLinesValidOperations.txt index eda2359c679..fe9e89a2bac 100644 --- a/compiler/testData/psi/NewLinesValidOperations.txt +++ b/compiler/testData/psi/NewLinesValidOperations.txt @@ -1,4 +1,4 @@ -JetFile: NewLinesValidOperations.jet +JetFile: NewLinesValidOperations.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/NewlinesInParentheses.jet b/compiler/testData/psi/NewlinesInParentheses.kt similarity index 100% rename from compiler/testData/psi/NewlinesInParentheses.jet rename to compiler/testData/psi/NewlinesInParentheses.kt diff --git a/compiler/testData/psi/NewlinesInParentheses.txt b/compiler/testData/psi/NewlinesInParentheses.txt index 0adcbc31284..1f60facecec 100644 --- a/compiler/testData/psi/NewlinesInParentheses.txt +++ b/compiler/testData/psi/NewlinesInParentheses.txt @@ -1,4 +1,4 @@ -JetFile: NewlinesInParentheses.jet +JetFile: NewlinesInParentheses.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/NotIsAndNotIn.jet b/compiler/testData/psi/NotIsAndNotIn.kt similarity index 100% rename from compiler/testData/psi/NotIsAndNotIn.jet rename to compiler/testData/psi/NotIsAndNotIn.kt diff --git a/compiler/testData/psi/NotIsAndNotIn.txt b/compiler/testData/psi/NotIsAndNotIn.txt index edeb0178b98..75312870f11 100644 --- a/compiler/testData/psi/NotIsAndNotIn.txt +++ b/compiler/testData/psi/NotIsAndNotIn.txt @@ -1,4 +1,4 @@ -JetFile: NotIsAndNotIn.jet +JetFile: NotIsAndNotIn.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/ObjectLiteralAsStatement.jet b/compiler/testData/psi/ObjectLiteralAsStatement.kt similarity index 100% rename from compiler/testData/psi/ObjectLiteralAsStatement.jet rename to compiler/testData/psi/ObjectLiteralAsStatement.kt diff --git a/compiler/testData/psi/ObjectLiteralAsStatement.txt b/compiler/testData/psi/ObjectLiteralAsStatement.txt index d60e26862e0..d33d30820cb 100644 --- a/compiler/testData/psi/ObjectLiteralAsStatement.txt +++ b/compiler/testData/psi/ObjectLiteralAsStatement.txt @@ -1,4 +1,4 @@ -JetFile: ObjectLiteralAsStatement.jet +JetFile: ObjectLiteralAsStatement.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/Precedence.jet b/compiler/testData/psi/Precedence.kt similarity index 100% rename from compiler/testData/psi/Precedence.jet rename to compiler/testData/psi/Precedence.kt diff --git a/compiler/testData/psi/Precedence.txt b/compiler/testData/psi/Precedence.txt index 461f4d9435d..ab3b26f8eff 100644 --- a/compiler/testData/psi/Precedence.txt +++ b/compiler/testData/psi/Precedence.txt @@ -1,4 +1,4 @@ -JetFile: Precedence.jet +JetFile: Precedence.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.jet b/compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt similarity index 100% rename from compiler/testData/psi/PrimaryConstructorModifiers_ERR.jet rename to compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt diff --git a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt b/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt index 925084e3d9c..3110b6e8834 100644 --- a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt +++ b/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt @@ -1,4 +1,4 @@ -JetFile: PrimaryConstructorModifiers_ERR.jet +JetFile: PrimaryConstructorModifiers_ERR.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/Properties.jet b/compiler/testData/psi/Properties.kt similarity index 100% rename from compiler/testData/psi/Properties.jet rename to compiler/testData/psi/Properties.kt diff --git a/compiler/testData/psi/Properties.txt b/compiler/testData/psi/Properties.txt index bc8dab687c5..b45436ba29d 100644 --- a/compiler/testData/psi/Properties.txt +++ b/compiler/testData/psi/Properties.txt @@ -1,4 +1,4 @@ -JetFile: Properties.jet +JetFile: Properties.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/PropertiesFollowedByInitializers.jet b/compiler/testData/psi/PropertiesFollowedByInitializers.kt similarity index 100% rename from compiler/testData/psi/PropertiesFollowedByInitializers.jet rename to compiler/testData/psi/PropertiesFollowedByInitializers.kt diff --git a/compiler/testData/psi/PropertiesFollowedByInitializers.txt b/compiler/testData/psi/PropertiesFollowedByInitializers.txt index a504f04df07..948b8d2244d 100644 --- a/compiler/testData/psi/PropertiesFollowedByInitializers.txt +++ b/compiler/testData/psi/PropertiesFollowedByInitializers.txt @@ -1,4 +1,4 @@ -JetFile: PropertiesFollowedByInitializers.jet +JetFile: PropertiesFollowedByInitializers.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/Properties_ERR.jet b/compiler/testData/psi/Properties_ERR.kt similarity index 100% rename from compiler/testData/psi/Properties_ERR.jet rename to compiler/testData/psi/Properties_ERR.kt diff --git a/compiler/testData/psi/Properties_ERR.txt b/compiler/testData/psi/Properties_ERR.txt index f15af5049e5..de7b812a489 100644 --- a/compiler/testData/psi/Properties_ERR.txt +++ b/compiler/testData/psi/Properties_ERR.txt @@ -1,4 +1,4 @@ -JetFile: Properties_ERR.jet +JetFile: Properties_ERR.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/QuotedIdentifiers.jet b/compiler/testData/psi/QuotedIdentifiers.kt similarity index 100% rename from compiler/testData/psi/QuotedIdentifiers.jet rename to compiler/testData/psi/QuotedIdentifiers.kt diff --git a/compiler/testData/psi/QuotedIdentifiers.txt b/compiler/testData/psi/QuotedIdentifiers.txt index 09363af9c11..4176122a09f 100644 --- a/compiler/testData/psi/QuotedIdentifiers.txt +++ b/compiler/testData/psi/QuotedIdentifiers.txt @@ -1,4 +1,4 @@ -JetFile: QuotedIdentifiers.jet +JetFile: QuotedIdentifiers.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/RootNamespace.jet b/compiler/testData/psi/RootNamespace.kt similarity index 100% rename from compiler/testData/psi/RootNamespace.jet rename to compiler/testData/psi/RootNamespace.kt diff --git a/compiler/testData/psi/RootNamespace.txt b/compiler/testData/psi/RootNamespace.txt index 52856cc5cf5..affefe2b534 100644 --- a/compiler/testData/psi/RootNamespace.txt +++ b/compiler/testData/psi/RootNamespace.txt @@ -1,4 +1,4 @@ -JetFile: RootNamespace.jet +JetFile: RootNamespace.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/SemicolonAfterIf.jet b/compiler/testData/psi/SemicolonAfterIf.kt similarity index 100% rename from compiler/testData/psi/SemicolonAfterIf.jet rename to compiler/testData/psi/SemicolonAfterIf.kt diff --git a/compiler/testData/psi/SemicolonAfterIf.txt b/compiler/testData/psi/SemicolonAfterIf.txt index aa0cca48ba0..c1cee2533bb 100644 --- a/compiler/testData/psi/SemicolonAfterIf.txt +++ b/compiler/testData/psi/SemicolonAfterIf.txt @@ -1,4 +1,4 @@ -JetFile: SemicolonAfterIf.jet +JetFile: SemicolonAfterIf.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/ShortAnnotations.jet b/compiler/testData/psi/ShortAnnotations.kt similarity index 100% rename from compiler/testData/psi/ShortAnnotations.jet rename to compiler/testData/psi/ShortAnnotations.kt diff --git a/compiler/testData/psi/ShortAnnotations.txt b/compiler/testData/psi/ShortAnnotations.txt index b979687731f..152b2ce2a8e 100644 --- a/compiler/testData/psi/ShortAnnotations.txt +++ b/compiler/testData/psi/ShortAnnotations.txt @@ -1,4 +1,4 @@ -JetFile: ShortAnnotations.jet +JetFile: ShortAnnotations.kt NAMESPACE_HEADER MODIFIER_LIST ANNOTATION_ENTRY diff --git a/compiler/testData/psi/SimpleClassMembers.jet b/compiler/testData/psi/SimpleClassMembers.kt similarity index 100% rename from compiler/testData/psi/SimpleClassMembers.jet rename to compiler/testData/psi/SimpleClassMembers.kt diff --git a/compiler/testData/psi/SimpleClassMembers.txt b/compiler/testData/psi/SimpleClassMembers.txt index 0d617dbe11c..0121c0502db 100644 --- a/compiler/testData/psi/SimpleClassMembers.txt +++ b/compiler/testData/psi/SimpleClassMembers.txt @@ -1,4 +1,4 @@ -JetFile: SimpleClassMembers.jet +JetFile: SimpleClassMembers.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/SimpleClassMembers_ERR.jet b/compiler/testData/psi/SimpleClassMembers_ERR.kt similarity index 100% rename from compiler/testData/psi/SimpleClassMembers_ERR.jet rename to compiler/testData/psi/SimpleClassMembers_ERR.kt diff --git a/compiler/testData/psi/SimpleClassMembers_ERR.txt b/compiler/testData/psi/SimpleClassMembers_ERR.txt index 4d2c3c2448c..a0fb9e55ebb 100644 --- a/compiler/testData/psi/SimpleClassMembers_ERR.txt +++ b/compiler/testData/psi/SimpleClassMembers_ERR.txt @@ -1,4 +1,4 @@ -JetFile: SimpleClassMembers_ERR.jet +JetFile: SimpleClassMembers_ERR.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/SimpleExpressions.jet b/compiler/testData/psi/SimpleExpressions.kt similarity index 100% rename from compiler/testData/psi/SimpleExpressions.jet rename to compiler/testData/psi/SimpleExpressions.kt diff --git a/compiler/testData/psi/SimpleExpressions.txt b/compiler/testData/psi/SimpleExpressions.txt index db8b92fd064..3831497dc81 100644 --- a/compiler/testData/psi/SimpleExpressions.txt +++ b/compiler/testData/psi/SimpleExpressions.txt @@ -1,4 +1,4 @@ -JetFile: SimpleExpressions.jet +JetFile: SimpleExpressions.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/SimpleModifiers.jet b/compiler/testData/psi/SimpleModifiers.kt similarity index 100% rename from compiler/testData/psi/SimpleModifiers.jet rename to compiler/testData/psi/SimpleModifiers.kt diff --git a/compiler/testData/psi/SimpleModifiers.txt b/compiler/testData/psi/SimpleModifiers.txt index 488a5d3d7da..892ba437751 100644 --- a/compiler/testData/psi/SimpleModifiers.txt +++ b/compiler/testData/psi/SimpleModifiers.txt @@ -1,4 +1,4 @@ -JetFile: SimpleModifiers.jet +JetFile: SimpleModifiers.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/SoftKeywords.jet b/compiler/testData/psi/SoftKeywords.kt similarity index 100% rename from compiler/testData/psi/SoftKeywords.jet rename to compiler/testData/psi/SoftKeywords.kt diff --git a/compiler/testData/psi/SoftKeywords.txt b/compiler/testData/psi/SoftKeywords.txt index 6a91a5b7fc7..ed0001e8af6 100644 --- a/compiler/testData/psi/SoftKeywords.txt +++ b/compiler/testData/psi/SoftKeywords.txt @@ -1,4 +1,4 @@ -JetFile: SoftKeywords.jet +JetFile: SoftKeywords.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/SoftKeywordsInTypeArguments.jet b/compiler/testData/psi/SoftKeywordsInTypeArguments.kt similarity index 100% rename from compiler/testData/psi/SoftKeywordsInTypeArguments.jet rename to compiler/testData/psi/SoftKeywordsInTypeArguments.kt diff --git a/compiler/testData/psi/SoftKeywordsInTypeArguments.txt b/compiler/testData/psi/SoftKeywordsInTypeArguments.txt index 9ef98d46272..cca20db0b58 100644 --- a/compiler/testData/psi/SoftKeywordsInTypeArguments.txt +++ b/compiler/testData/psi/SoftKeywordsInTypeArguments.txt @@ -1,4 +1,4 @@ -JetFile: SoftKeywordsInTypeArguments.jet +JetFile: SoftKeywordsInTypeArguments.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/StringTemplates.jet b/compiler/testData/psi/StringTemplates.kt similarity index 100% rename from compiler/testData/psi/StringTemplates.jet rename to compiler/testData/psi/StringTemplates.kt diff --git a/compiler/testData/psi/StringTemplates.txt b/compiler/testData/psi/StringTemplates.txt index dabb289301c..a85ce59c11a 100644 --- a/compiler/testData/psi/StringTemplates.txt +++ b/compiler/testData/psi/StringTemplates.txt @@ -1,4 +1,4 @@ -JetFile: StringTemplates.jet +JetFile: StringTemplates.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/Super.jet b/compiler/testData/psi/Super.kt similarity index 100% rename from compiler/testData/psi/Super.jet rename to compiler/testData/psi/Super.kt diff --git a/compiler/testData/psi/Super.txt b/compiler/testData/psi/Super.txt index 86fcb6e831b..4389d494084 100644 --- a/compiler/testData/psi/Super.txt +++ b/compiler/testData/psi/Super.txt @@ -1,4 +1,4 @@ -JetFile: Super.jet +JetFile: Super.kt PsiComment(EOL_COMMENT)('// KT-156 Fix the this syntax') PsiWhiteSpace('\n') NAMESPACE_HEADER diff --git a/compiler/testData/psi/ThisType.jet b/compiler/testData/psi/ThisType.kt similarity index 100% rename from compiler/testData/psi/ThisType.jet rename to compiler/testData/psi/ThisType.kt diff --git a/compiler/testData/psi/ThisType.txt b/compiler/testData/psi/ThisType.txt index 948b2012481..62e51b41f90 100644 --- a/compiler/testData/psi/ThisType.txt +++ b/compiler/testData/psi/ThisType.txt @@ -1,4 +1,4 @@ -JetFile: ThisType.jet +JetFile: ThisType.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/TryRecovery.jet b/compiler/testData/psi/TryRecovery.kt similarity index 100% rename from compiler/testData/psi/TryRecovery.jet rename to compiler/testData/psi/TryRecovery.kt diff --git a/compiler/testData/psi/TryRecovery.txt b/compiler/testData/psi/TryRecovery.txt index 7c09b2ad61e..6f2d99f3ba2 100644 --- a/compiler/testData/psi/TryRecovery.txt +++ b/compiler/testData/psi/TryRecovery.txt @@ -1,4 +1,4 @@ -JetFile: TryRecovery.jet +JetFile: TryRecovery.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/TypeAnnotations.jet b/compiler/testData/psi/TypeAnnotations.kt similarity index 100% rename from compiler/testData/psi/TypeAnnotations.jet rename to compiler/testData/psi/TypeAnnotations.kt diff --git a/compiler/testData/psi/TypeAnnotations.txt b/compiler/testData/psi/TypeAnnotations.txt index 1782d9264e1..4024d7e3c45 100644 --- a/compiler/testData/psi/TypeAnnotations.txt +++ b/compiler/testData/psi/TypeAnnotations.txt @@ -1,4 +1,4 @@ -JetFile: TypeAnnotations.jet +JetFile: TypeAnnotations.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/TypeConstraints.jet b/compiler/testData/psi/TypeConstraints.kt similarity index 100% rename from compiler/testData/psi/TypeConstraints.jet rename to compiler/testData/psi/TypeConstraints.kt diff --git a/compiler/testData/psi/TypeConstraints.txt b/compiler/testData/psi/TypeConstraints.txt index a173c9e15ec..cfff9631969 100644 --- a/compiler/testData/psi/TypeConstraints.txt +++ b/compiler/testData/psi/TypeConstraints.txt @@ -1,4 +1,4 @@ -JetFile: TypeConstraints.jet +JetFile: TypeConstraints.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/TypeDef.jet b/compiler/testData/psi/TypeDef.kt similarity index 100% rename from compiler/testData/psi/TypeDef.jet rename to compiler/testData/psi/TypeDef.kt diff --git a/compiler/testData/psi/TypeDef.txt b/compiler/testData/psi/TypeDef.txt index 0579b100c65..f88919a4a73 100644 --- a/compiler/testData/psi/TypeDef.txt +++ b/compiler/testData/psi/TypeDef.txt @@ -1,4 +1,4 @@ -JetFile: TypeDef.jet +JetFile: TypeDef.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/TypeDef_ERR.jet b/compiler/testData/psi/TypeDef_ERR.kt similarity index 100% rename from compiler/testData/psi/TypeDef_ERR.jet rename to compiler/testData/psi/TypeDef_ERR.kt diff --git a/compiler/testData/psi/TypeDef_ERR.txt b/compiler/testData/psi/TypeDef_ERR.txt index 05b6866fd8a..b87a6585d4d 100644 --- a/compiler/testData/psi/TypeDef_ERR.txt +++ b/compiler/testData/psi/TypeDef_ERR.txt @@ -1,4 +1,4 @@ -JetFile: TypeDef_ERR.jet +JetFile: TypeDef_ERR.kt NAMESPACE_HEADER TYPEDEF diff --git a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.jet b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt similarity index 100% rename from compiler/testData/psi/TypeExpressionAmbiguities_ERR.jet rename to compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt diff --git a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt index 5d776f8880f..b29a50df64e 100644 --- a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt +++ b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt @@ -1,4 +1,4 @@ -JetFile: TypeExpressionAmbiguities_ERR.jet +JetFile: TypeExpressionAmbiguities_ERR.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/TypeParametersBeforeName.jet b/compiler/testData/psi/TypeParametersBeforeName.kt similarity index 100% rename from compiler/testData/psi/TypeParametersBeforeName.jet rename to compiler/testData/psi/TypeParametersBeforeName.kt diff --git a/compiler/testData/psi/TypeParametersBeforeName.txt b/compiler/testData/psi/TypeParametersBeforeName.txt index 3e2cec01b63..ef9db3c6bfb 100644 --- a/compiler/testData/psi/TypeParametersBeforeName.txt +++ b/compiler/testData/psi/TypeParametersBeforeName.txt @@ -1,4 +1,4 @@ -JetFile: TypeParametersBeforeName.jet +JetFile: TypeParametersBeforeName.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/When.jet b/compiler/testData/psi/When.kt similarity index 100% rename from compiler/testData/psi/When.jet rename to compiler/testData/psi/When.kt diff --git a/compiler/testData/psi/When.txt b/compiler/testData/psi/When.txt index 3e14592e6bb..54c6e0ad59e 100644 --- a/compiler/testData/psi/When.txt +++ b/compiler/testData/psi/When.txt @@ -1,4 +1,4 @@ -JetFile: When.jet +JetFile: When.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/When_ERR.jet b/compiler/testData/psi/When_ERR.kt similarity index 100% rename from compiler/testData/psi/When_ERR.jet rename to compiler/testData/psi/When_ERR.kt diff --git a/compiler/testData/psi/When_ERR.txt b/compiler/testData/psi/When_ERR.txt index 1eb95474699..ba3240f5c03 100644 --- a/compiler/testData/psi/When_ERR.txt +++ b/compiler/testData/psi/When_ERR.txt @@ -1,4 +1,4 @@ -JetFile: When_ERR.jet +JetFile: When_ERR.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/examples/AnonymousObjects.jet b/compiler/testData/psi/examples/AnonymousObjects.kt similarity index 100% rename from compiler/testData/psi/examples/AnonymousObjects.jet rename to compiler/testData/psi/examples/AnonymousObjects.kt diff --git a/compiler/testData/psi/examples/AnonymousObjects.txt b/compiler/testData/psi/examples/AnonymousObjects.txt index 9f64958403b..189af476a03 100644 --- a/compiler/testData/psi/examples/AnonymousObjects.txt +++ b/compiler/testData/psi/examples/AnonymousObjects.txt @@ -1,4 +1,4 @@ -JetFile: AnonymousObjects.jet +JetFile: AnonymousObjects.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/examples/BinaryTree.jet b/compiler/testData/psi/examples/BinaryTree.kt similarity index 100% rename from compiler/testData/psi/examples/BinaryTree.jet rename to compiler/testData/psi/examples/BinaryTree.kt diff --git a/compiler/testData/psi/examples/BinaryTree.txt b/compiler/testData/psi/examples/BinaryTree.txt index 165a2d03f9a..c6eb01b7c1d 100644 --- a/compiler/testData/psi/examples/BinaryTree.txt +++ b/compiler/testData/psi/examples/BinaryTree.txt @@ -1,4 +1,4 @@ -JetFile: BinaryTree.jet +JetFile: BinaryTree.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/BitArith.jet b/compiler/testData/psi/examples/BitArith.kt similarity index 100% rename from compiler/testData/psi/examples/BitArith.jet rename to compiler/testData/psi/examples/BitArith.kt diff --git a/compiler/testData/psi/examples/BitArith.txt b/compiler/testData/psi/examples/BitArith.txt index 7d0a9fcbdec..ad18aa9f136 100644 --- a/compiler/testData/psi/examples/BitArith.txt +++ b/compiler/testData/psi/examples/BitArith.txt @@ -1,4 +1,4 @@ -JetFile: BitArith.jet +JetFile: BitArith.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/examples/Builder.jet b/compiler/testData/psi/examples/Builder.kt similarity index 100% rename from compiler/testData/psi/examples/Builder.jet rename to compiler/testData/psi/examples/Builder.kt diff --git a/compiler/testData/psi/examples/Builder.txt b/compiler/testData/psi/examples/Builder.txt index 375217cf18e..3651fc27a6f 100644 --- a/compiler/testData/psi/examples/Builder.txt +++ b/compiler/testData/psi/examples/Builder.txt @@ -1,4 +1,4 @@ -JetFile: Builder.jet +JetFile: Builder.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/examples/Color.jet b/compiler/testData/psi/examples/Color.kt similarity index 100% rename from compiler/testData/psi/examples/Color.jet rename to compiler/testData/psi/examples/Color.kt diff --git a/compiler/testData/psi/examples/Color.txt b/compiler/testData/psi/examples/Color.txt index 23a939f9639..fc67dd6d2e1 100644 --- a/compiler/testData/psi/examples/Color.txt +++ b/compiler/testData/psi/examples/Color.txt @@ -1,4 +1,4 @@ -JetFile: Color.jet +JetFile: Color.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/FunctionsAndTypes.jet b/compiler/testData/psi/examples/FunctionsAndTypes.kt similarity index 100% rename from compiler/testData/psi/examples/FunctionsAndTypes.jet rename to compiler/testData/psi/examples/FunctionsAndTypes.kt diff --git a/compiler/testData/psi/examples/FunctionsAndTypes.txt b/compiler/testData/psi/examples/FunctionsAndTypes.txt index 5c394031a67..86b99ea79a3 100644 --- a/compiler/testData/psi/examples/FunctionsAndTypes.txt +++ b/compiler/testData/psi/examples/FunctionsAndTypes.txt @@ -1,4 +1,4 @@ -JetFile: FunctionsAndTypes.jet +JetFile: FunctionsAndTypes.kt NAMESPACE_HEADER TYPEDEF diff --git a/compiler/testData/psi/examples/Graph.jet b/compiler/testData/psi/examples/Graph.kt similarity index 100% rename from compiler/testData/psi/examples/Graph.jet rename to compiler/testData/psi/examples/Graph.kt diff --git a/compiler/testData/psi/examples/Graph.txt b/compiler/testData/psi/examples/Graph.txt index da2b18197bb..3d001d1ae6c 100644 --- a/compiler/testData/psi/examples/Graph.txt +++ b/compiler/testData/psi/examples/Graph.txt @@ -1,4 +1,4 @@ -JetFile: Graph.jet +JetFile: Graph.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/IPushPop.jet b/compiler/testData/psi/examples/IPushPop.kt similarity index 100% rename from compiler/testData/psi/examples/IPushPop.jet rename to compiler/testData/psi/examples/IPushPop.kt diff --git a/compiler/testData/psi/examples/IPushPop.txt b/compiler/testData/psi/examples/IPushPop.txt index ad0ed391831..a734dc11bed 100644 --- a/compiler/testData/psi/examples/IPushPop.txt +++ b/compiler/testData/psi/examples/IPushPop.txt @@ -1,4 +1,4 @@ -JetFile: IPushPop.jet +JetFile: IPushPop.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/LINQ.jet b/compiler/testData/psi/examples/LINQ.kt similarity index 100% rename from compiler/testData/psi/examples/LINQ.jet rename to compiler/testData/psi/examples/LINQ.kt diff --git a/compiler/testData/psi/examples/LINQ.txt b/compiler/testData/psi/examples/LINQ.txt index 13cff50eeb6..c417359eddc 100644 --- a/compiler/testData/psi/examples/LINQ.txt +++ b/compiler/testData/psi/examples/LINQ.txt @@ -1,4 +1,4 @@ -JetFile: LINQ.jet +JetFile: LINQ.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/examples/PolymorphicClassObjects.jet b/compiler/testData/psi/examples/PolymorphicClassObjects.kt similarity index 100% rename from compiler/testData/psi/examples/PolymorphicClassObjects.jet rename to compiler/testData/psi/examples/PolymorphicClassObjects.kt diff --git a/compiler/testData/psi/examples/PolymorphicClassObjects.txt b/compiler/testData/psi/examples/PolymorphicClassObjects.txt index a7be7382e81..845e5f01b0b 100644 --- a/compiler/testData/psi/examples/PolymorphicClassObjects.txt +++ b/compiler/testData/psi/examples/PolymorphicClassObjects.txt @@ -1,4 +1,4 @@ -JetFile: PolymorphicClassObjects.jet +JetFile: PolymorphicClassObjects.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/Queue.jet b/compiler/testData/psi/examples/Queue.kt similarity index 100% rename from compiler/testData/psi/examples/Queue.jet rename to compiler/testData/psi/examples/Queue.kt diff --git a/compiler/testData/psi/examples/Queue.txt b/compiler/testData/psi/examples/Queue.txt index fbf0333a5be..4542b09a549 100644 --- a/compiler/testData/psi/examples/Queue.txt +++ b/compiler/testData/psi/examples/Queue.txt @@ -1,4 +1,4 @@ -JetFile: Queue.jet +JetFile: Queue.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/Stack.jet b/compiler/testData/psi/examples/Stack.kt similarity index 100% rename from compiler/testData/psi/examples/Stack.jet rename to compiler/testData/psi/examples/Stack.kt diff --git a/compiler/testData/psi/examples/Stack.txt b/compiler/testData/psi/examples/Stack.txt index 4023d340851..1373a53e027 100644 --- a/compiler/testData/psi/examples/Stack.txt +++ b/compiler/testData/psi/examples/Stack.txt @@ -1,4 +1,4 @@ -JetFile: Stack.jet +JetFile: Stack.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/UnionFind.jet b/compiler/testData/psi/examples/UnionFind.kt similarity index 100% rename from compiler/testData/psi/examples/UnionFind.jet rename to compiler/testData/psi/examples/UnionFind.kt diff --git a/compiler/testData/psi/examples/UnionFind.txt b/compiler/testData/psi/examples/UnionFind.txt index 53b14b35d3f..e40b0ccffc1 100644 --- a/compiler/testData/psi/examples/UnionFind.txt +++ b/compiler/testData/psi/examples/UnionFind.txt @@ -1,4 +1,4 @@ -JetFile: UnionFind.jet +JetFile: UnionFind.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/UpdateOperation.jet b/compiler/testData/psi/examples/UpdateOperation.kt similarity index 100% rename from compiler/testData/psi/examples/UpdateOperation.jet rename to compiler/testData/psi/examples/UpdateOperation.kt diff --git a/compiler/testData/psi/examples/UpdateOperation.txt b/compiler/testData/psi/examples/UpdateOperation.txt index 872264a107b..8f374cf16a0 100644 --- a/compiler/testData/psi/examples/UpdateOperation.txt +++ b/compiler/testData/psi/examples/UpdateOperation.txt @@ -1,4 +1,4 @@ -JetFile: UpdateOperation.jet +JetFile: UpdateOperation.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/With.jet b/compiler/testData/psi/examples/With.kt similarity index 100% rename from compiler/testData/psi/examples/With.jet rename to compiler/testData/psi/examples/With.kt diff --git a/compiler/testData/psi/examples/With.txt b/compiler/testData/psi/examples/With.txt index 832d102888b..1ab3ced3cdf 100644 --- a/compiler/testData/psi/examples/With.txt +++ b/compiler/testData/psi/examples/With.txt @@ -1,4 +1,4 @@ -JetFile: With.jet +JetFile: With.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/examples/array/MutableArray.jet b/compiler/testData/psi/examples/array/MutableArray.kt similarity index 100% rename from compiler/testData/psi/examples/array/MutableArray.jet rename to compiler/testData/psi/examples/array/MutableArray.kt diff --git a/compiler/testData/psi/examples/array/MutableArray.txt b/compiler/testData/psi/examples/array/MutableArray.txt index c08fd2add36..28009b5b578 100644 --- a/compiler/testData/psi/examples/array/MutableArray.txt +++ b/compiler/testData/psi/examples/array/MutableArray.txt @@ -1,4 +1,4 @@ -JetFile: MutableArray.jet +JetFile: MutableArray.kt KDoc PsiElement(KDOC_START)('/**') PsiWhiteSpace('\n ') diff --git a/compiler/testData/psi/examples/collections/ArrayList.jet b/compiler/testData/psi/examples/collections/ArrayList.kt similarity index 100% rename from compiler/testData/psi/examples/collections/ArrayList.jet rename to compiler/testData/psi/examples/collections/ArrayList.kt diff --git a/compiler/testData/psi/examples/collections/ArrayList.txt b/compiler/testData/psi/examples/collections/ArrayList.txt index dcaa8b2f8bf..9121e1a12aa 100644 --- a/compiler/testData/psi/examples/collections/ArrayList.txt +++ b/compiler/testData/psi/examples/collections/ArrayList.txt @@ -1,4 +1,4 @@ -JetFile: ArrayList.jet +JetFile: ArrayList.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/HashMap.jet b/compiler/testData/psi/examples/collections/HashMap.kt similarity index 100% rename from compiler/testData/psi/examples/collections/HashMap.jet rename to compiler/testData/psi/examples/collections/HashMap.kt diff --git a/compiler/testData/psi/examples/collections/HashMap.txt b/compiler/testData/psi/examples/collections/HashMap.txt index 7816fbcb988..48ca0f1523f 100644 --- a/compiler/testData/psi/examples/collections/HashMap.txt +++ b/compiler/testData/psi/examples/collections/HashMap.txt @@ -1,4 +1,4 @@ -JetFile: HashMap.jet +JetFile: HashMap.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IIterable.jet b/compiler/testData/psi/examples/collections/IIterable.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IIterable.jet rename to compiler/testData/psi/examples/collections/IIterable.kt diff --git a/compiler/testData/psi/examples/collections/IIterable.txt b/compiler/testData/psi/examples/collections/IIterable.txt index 3b5bb803f2d..5a2986ac953 100644 --- a/compiler/testData/psi/examples/collections/IIterable.txt +++ b/compiler/testData/psi/examples/collections/IIterable.txt @@ -1,4 +1,4 @@ -JetFile: IIterable.jet +JetFile: IIterable.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IIterator.jet b/compiler/testData/psi/examples/collections/IIterator.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IIterator.jet rename to compiler/testData/psi/examples/collections/IIterator.kt diff --git a/compiler/testData/psi/examples/collections/IIterator.txt b/compiler/testData/psi/examples/collections/IIterator.txt index 282ba21fb34..7270c3eeb90 100644 --- a/compiler/testData/psi/examples/collections/IIterator.txt +++ b/compiler/testData/psi/examples/collections/IIterator.txt @@ -1,4 +1,4 @@ -JetFile: IIterator.jet +JetFile: IIterator.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IList.jet b/compiler/testData/psi/examples/collections/IList.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IList.jet rename to compiler/testData/psi/examples/collections/IList.kt diff --git a/compiler/testData/psi/examples/collections/IList.txt b/compiler/testData/psi/examples/collections/IList.txt index f678d49c294..8d0eb9a8560 100644 --- a/compiler/testData/psi/examples/collections/IList.txt +++ b/compiler/testData/psi/examples/collections/IList.txt @@ -1,4 +1,4 @@ -JetFile: IList.jet +JetFile: IList.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IMutableIterable.jet b/compiler/testData/psi/examples/collections/IMutableIterable.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IMutableIterable.jet rename to compiler/testData/psi/examples/collections/IMutableIterable.kt diff --git a/compiler/testData/psi/examples/collections/IMutableIterable.txt b/compiler/testData/psi/examples/collections/IMutableIterable.txt index 3117b4a29c3..9484af62b21 100644 --- a/compiler/testData/psi/examples/collections/IMutableIterable.txt +++ b/compiler/testData/psi/examples/collections/IMutableIterable.txt @@ -1,4 +1,4 @@ -JetFile: IMutableIterable.jet +JetFile: IMutableIterable.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IMutableIterator.jet b/compiler/testData/psi/examples/collections/IMutableIterator.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IMutableIterator.jet rename to compiler/testData/psi/examples/collections/IMutableIterator.kt diff --git a/compiler/testData/psi/examples/collections/IMutableIterator.txt b/compiler/testData/psi/examples/collections/IMutableIterator.txt index 58436d907c3..b2b3514c221 100644 --- a/compiler/testData/psi/examples/collections/IMutableIterator.txt +++ b/compiler/testData/psi/examples/collections/IMutableIterator.txt @@ -1,4 +1,4 @@ -JetFile: IMutableIterator.jet +JetFile: IMutableIterator.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IMutableList.jet b/compiler/testData/psi/examples/collections/IMutableList.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IMutableList.jet rename to compiler/testData/psi/examples/collections/IMutableList.kt diff --git a/compiler/testData/psi/examples/collections/IMutableList.txt b/compiler/testData/psi/examples/collections/IMutableList.txt index bfbd3c0c398..4676d0a8ef9 100644 --- a/compiler/testData/psi/examples/collections/IMutableList.txt +++ b/compiler/testData/psi/examples/collections/IMutableList.txt @@ -1,4 +1,4 @@ -JetFile: IMutableList.jet +JetFile: IMutableList.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/IMutableSet.jet b/compiler/testData/psi/examples/collections/IMutableSet.kt similarity index 100% rename from compiler/testData/psi/examples/collections/IMutableSet.jet rename to compiler/testData/psi/examples/collections/IMutableSet.kt diff --git a/compiler/testData/psi/examples/collections/IMutableSet.txt b/compiler/testData/psi/examples/collections/IMutableSet.txt index 42ad33be104..352ba989d66 100644 --- a/compiler/testData/psi/examples/collections/IMutableSet.txt +++ b/compiler/testData/psi/examples/collections/IMutableSet.txt @@ -1,4 +1,4 @@ -JetFile: IMutableSet.jet +JetFile: IMutableSet.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/ISet.jet b/compiler/testData/psi/examples/collections/ISet.kt similarity index 100% rename from compiler/testData/psi/examples/collections/ISet.jet rename to compiler/testData/psi/examples/collections/ISet.kt diff --git a/compiler/testData/psi/examples/collections/ISet.txt b/compiler/testData/psi/examples/collections/ISet.txt index e4d62526090..b0c314df151 100644 --- a/compiler/testData/psi/examples/collections/ISet.txt +++ b/compiler/testData/psi/examples/collections/ISet.txt @@ -1,4 +1,4 @@ -JetFile: ISet.jet +JetFile: ISet.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/ISized.jet b/compiler/testData/psi/examples/collections/ISized.kt similarity index 100% rename from compiler/testData/psi/examples/collections/ISized.jet rename to compiler/testData/psi/examples/collections/ISized.kt diff --git a/compiler/testData/psi/examples/collections/ISized.txt b/compiler/testData/psi/examples/collections/ISized.txt index ce3e809fd9e..07ab3f10cd6 100644 --- a/compiler/testData/psi/examples/collections/ISized.txt +++ b/compiler/testData/psi/examples/collections/ISized.txt @@ -1,4 +1,4 @@ -JetFile: ISized.jet +JetFile: ISized.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/collections/LinkedList.jet b/compiler/testData/psi/examples/collections/LinkedList.kt similarity index 100% rename from compiler/testData/psi/examples/collections/LinkedList.jet rename to compiler/testData/psi/examples/collections/LinkedList.kt diff --git a/compiler/testData/psi/examples/collections/LinkedList.txt b/compiler/testData/psi/examples/collections/LinkedList.txt index af20f87d9c6..508ce9530f8 100644 --- a/compiler/testData/psi/examples/collections/LinkedList.txt +++ b/compiler/testData/psi/examples/collections/LinkedList.txt @@ -1,4 +1,4 @@ -JetFile: LinkedList.jet +JetFile: LinkedList.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/io/IOSamples.jet b/compiler/testData/psi/examples/io/IOSamples.kt similarity index 100% rename from compiler/testData/psi/examples/io/IOSamples.jet rename to compiler/testData/psi/examples/io/IOSamples.kt diff --git a/compiler/testData/psi/examples/io/IOSamples.txt b/compiler/testData/psi/examples/io/IOSamples.txt index c8bbb9c90bf..9447ad1ac27 100644 --- a/compiler/testData/psi/examples/io/IOSamples.txt +++ b/compiler/testData/psi/examples/io/IOSamples.txt @@ -1,4 +1,4 @@ -JetFile: IOSamples.jet +JetFile: IOSamples.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/map/IMap.jet b/compiler/testData/psi/examples/map/IMap.kt similarity index 100% rename from compiler/testData/psi/examples/map/IMap.jet rename to compiler/testData/psi/examples/map/IMap.kt diff --git a/compiler/testData/psi/examples/map/IMap.txt b/compiler/testData/psi/examples/map/IMap.txt index 86dd8b4d96c..c14dddf9f7a 100644 --- a/compiler/testData/psi/examples/map/IMap.txt +++ b/compiler/testData/psi/examples/map/IMap.txt @@ -1,4 +1,4 @@ -JetFile: IMap.jet +JetFile: IMap.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.jet b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt similarity index 100% rename from compiler/testData/psi/examples/priorityqueues/BinaryHeap.jet rename to compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt diff --git a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt index ea2a919bbf7..290977483b2 100644 --- a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt +++ b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt @@ -1,4 +1,4 @@ -JetFile: BinaryHeap.jet +JetFile: BinaryHeap.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.jet b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt similarity index 100% rename from compiler/testData/psi/examples/priorityqueues/IPriorityQueue.jet rename to compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt diff --git a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt index 66443013199..35366e47659 100644 --- a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt +++ b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt @@ -1,4 +1,4 @@ -JetFile: IPriorityQueue.jet +JetFile: IPriorityQueue.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt similarity index 100% rename from compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet rename to compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt diff --git a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt index ee2f06b5f16..05da7c3f2cc 100644 --- a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt +++ b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt @@ -1,4 +1,4 @@ -JetFile: PriorityQueueAsPushPop.jet +JetFile: PriorityQueueAsPushPop.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/examples/util/Comparison.jet b/compiler/testData/psi/examples/util/Comparison.kt similarity index 100% rename from compiler/testData/psi/examples/util/Comparison.jet rename to compiler/testData/psi/examples/util/Comparison.kt diff --git a/compiler/testData/psi/examples/util/Comparison.txt b/compiler/testData/psi/examples/util/Comparison.txt index 82f7316be26..390e0ade2a4 100644 --- a/compiler/testData/psi/examples/util/Comparison.txt +++ b/compiler/testData/psi/examples/util/Comparison.txt @@ -1,4 +1,4 @@ -JetFile: Comparison.jet +JetFile: Comparison.kt NAMESPACE_HEADER TYPEDEF diff --git a/compiler/testData/psi/examples/util/IComparable.jet b/compiler/testData/psi/examples/util/IComparable.kt similarity index 100% rename from compiler/testData/psi/examples/util/IComparable.jet rename to compiler/testData/psi/examples/util/IComparable.kt diff --git a/compiler/testData/psi/examples/util/IComparable.txt b/compiler/testData/psi/examples/util/IComparable.txt index d796a7b8d45..e903eef55a8 100644 --- a/compiler/testData/psi/examples/util/IComparable.txt +++ b/compiler/testData/psi/examples/util/IComparable.txt @@ -1,4 +1,4 @@ -JetFile: IComparable.jet +JetFile: IComparable.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt similarity index 100% rename from compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet rename to compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt diff --git a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt index f8dcc68f39c..ae21912896c 100644 --- a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt +++ b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt @@ -1,4 +1,4 @@ -JetFile: FunctionTypesWithFunctionReceivers.jet +JetFile: FunctionTypesWithFunctionReceivers.kt NAMESPACE_HEADER TYPEDEF diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt similarity index 100% rename from compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet rename to compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt index ef905a2f7aa..7b44fed1f17 100644 --- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt +++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt @@ -1,4 +1,4 @@ -JetFile: FunctionsWithFunctionReceivers.jet +JetFile: FunctionsWithFunctionReceivers.kt NAMESPACE_HEADER FUN diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt similarity index 100% rename from compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet rename to compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt index 5189feb1f32..1294994a702 100644 --- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt +++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt @@ -1,4 +1,4 @@ -JetFile: PropertiesWithFunctionReceivers.jet +JetFile: PropertiesWithFunctionReceivers.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.jet b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt similarity index 100% rename from compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.jet rename to compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt diff --git a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt index 62c804fc629..66ebb5a08b3 100644 --- a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt +++ b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt @@ -1,4 +1,4 @@ -JetFile: FunctionTypesAsArguments.jet +JetFile: FunctionTypesAsArguments.kt NAMESPACE_HEADER PROPERTY diff --git a/compiler/testData/psi/greatSyntacticShift/functionLiterals.jet b/compiler/testData/psi/greatSyntacticShift/functionLiterals.kt similarity index 100% rename from compiler/testData/psi/greatSyntacticShift/functionLiterals.jet rename to compiler/testData/psi/greatSyntacticShift/functionLiterals.kt diff --git a/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt b/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt index d6e01562812..177771ec61f 100644 --- a/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt +++ b/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt @@ -1,4 +1,4 @@ -JetFile: functionLiterals.jet +JetFile: functionLiterals.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/greatSyntacticShift/functionTypes.jet b/compiler/testData/psi/greatSyntacticShift/functionTypes.kt similarity index 100% rename from compiler/testData/psi/greatSyntacticShift/functionTypes.jet rename to compiler/testData/psi/greatSyntacticShift/functionTypes.kt diff --git a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt index 79630e4affa..1e0992461c6 100644 --- a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt +++ b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt @@ -1,4 +1,4 @@ -JetFile: functionTypes.jet +JetFile: functionTypes.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/kdoc/AtTags.jet b/compiler/testData/psi/kdoc/AtTags.kt similarity index 100% rename from compiler/testData/psi/kdoc/AtTags.jet rename to compiler/testData/psi/kdoc/AtTags.kt diff --git a/compiler/testData/psi/kdoc/AtTags.txt b/compiler/testData/psi/kdoc/AtTags.txt index 8e1dd8be825..8f8e2ca9a89 100644 --- a/compiler/testData/psi/kdoc/AtTags.txt +++ b/compiler/testData/psi/kdoc/AtTags.txt @@ -1,4 +1,4 @@ -JetFile: AtTags.jet +JetFile: AtTags.kt KDoc PsiElement(KDOC_START)('/**') PsiWhiteSpace('\n ') diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.jet b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt similarity index 100% rename from compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.jet rename to compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt index 92ddc1091be..2217171312a 100644 --- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt +++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt @@ -1,4 +1,4 @@ -JetFile: DocCommentAtBeginningOfFile1.jet +JetFile: DocCommentAtBeginningOfFile1.kt KDoc PsiElement(KDOC_START)('/**') NAMESPACE_HEADER diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.jet b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt similarity index 100% rename from compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.jet rename to compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt index 671a1aee945..0169b7f582c 100644 --- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt +++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt @@ -1,4 +1,4 @@ -JetFile: DocCommentAtBeginningOfFile2.jet +JetFile: DocCommentAtBeginningOfFile2.kt KDoc PsiElement(KDOC_START)('/**') PsiWhiteSpace('\n') diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.jet b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt similarity index 100% rename from compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.jet rename to compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt index b52d14d6751..61d1f9a4efd 100644 --- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt +++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt @@ -1,4 +1,4 @@ -JetFile: DocCommentAtBeginningOfFile3.jet +JetFile: DocCommentAtBeginningOfFile3.kt KDoc PsiElement(KDOC_START)('/**') PsiWhiteSpace('\n\n') diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.jet b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt similarity index 100% rename from compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.jet rename to compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt index 448c37b71ec..56dcdf01f9e 100644 --- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt +++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt @@ -1,4 +1,4 @@ -JetFile: DocCommentAtBeginningOfFile4.jet +JetFile: DocCommentAtBeginningOfFile4.kt KDoc PsiElement(KDOC_START)('/**') PsiWhiteSpace('\n\n') diff --git a/compiler/testData/psi/kdoc/Markdown.jet b/compiler/testData/psi/kdoc/Markdown.kt similarity index 100% rename from compiler/testData/psi/kdoc/Markdown.jet rename to compiler/testData/psi/kdoc/Markdown.kt diff --git a/compiler/testData/psi/kdoc/Markdown.txt b/compiler/testData/psi/kdoc/Markdown.txt index 6755464bcff..318ee50ca37 100644 --- a/compiler/testData/psi/kdoc/Markdown.txt +++ b/compiler/testData/psi/kdoc/Markdown.txt @@ -1,4 +1,4 @@ -JetFile: Markdown.jet +JetFile: Markdown.kt KDoc PsiElement(KDOC_START)('/**') PsiWhiteSpace('\n ') diff --git a/compiler/testData/psi/recovery/ImportRecovery.jet b/compiler/testData/psi/recovery/ImportRecovery.kt similarity index 100% rename from compiler/testData/psi/recovery/ImportRecovery.jet rename to compiler/testData/psi/recovery/ImportRecovery.kt diff --git a/compiler/testData/psi/recovery/ImportRecovery.txt b/compiler/testData/psi/recovery/ImportRecovery.txt index 6e66dd7f049..467e83172fe 100644 --- a/compiler/testData/psi/recovery/ImportRecovery.txt +++ b/compiler/testData/psi/recovery/ImportRecovery.txt @@ -1,4 +1,4 @@ -JetFile: ImportRecovery.jet +JetFile: ImportRecovery.kt NAMESPACE_HEADER IMPORT_DIRECTIVE diff --git a/compiler/testData/psi/recovery/PackageRecovery.jet b/compiler/testData/psi/recovery/PackageRecovery.kt similarity index 100% rename from compiler/testData/psi/recovery/PackageRecovery.jet rename to compiler/testData/psi/recovery/PackageRecovery.kt diff --git a/compiler/testData/psi/recovery/PackageRecovery.txt b/compiler/testData/psi/recovery/PackageRecovery.txt index 501092ae6bc..ad9da23aa98 100644 --- a/compiler/testData/psi/recovery/PackageRecovery.txt +++ b/compiler/testData/psi/recovery/PackageRecovery.txt @@ -1,4 +1,4 @@ -JetFile: PackageRecovery.jet +JetFile: PackageRecovery.kt NAMESPACE_HEADER PsiElement(package)('package') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.jet b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt similarity index 100% rename from compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.jet rename to compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt diff --git a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt index ebd52b9b83f..9e5483cbee6 100644 --- a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt +++ b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt @@ -1,4 +1,4 @@ -JetFile: ValueParameterNoTypeRecovery.jet +JetFile: ValueParameterNoTypeRecovery.kt NAMESPACE_HEADER CLASS diff --git a/compiler/testData/psi/recovery/kt2172.jet b/compiler/testData/psi/recovery/kt2172.kt similarity index 100% rename from compiler/testData/psi/recovery/kt2172.jet rename to compiler/testData/psi/recovery/kt2172.kt diff --git a/compiler/testData/psi/recovery/kt2172.txt b/compiler/testData/psi/recovery/kt2172.txt index 183e1a73587..f114114bed9 100644 --- a/compiler/testData/psi/recovery/kt2172.txt +++ b/compiler/testData/psi/recovery/kt2172.txt @@ -1,4 +1,4 @@ -JetFile: kt2172.jet +JetFile: kt2172.kt NAMESPACE_HEADER CLASS diff --git a/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java index 7612b109264..69b60d24359 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java +++ b/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java @@ -44,7 +44,7 @@ public abstract class AbstractJetParsingTest extends ParsingTestCase { } public AbstractJetParsingTest() { - super(".", "jet", new JetParserDefinition()); + super(".", "kt", new JetParserDefinition()); } private static void checkPsiGetters(JetElement elem) throws Throwable { @@ -88,6 +88,6 @@ public abstract class AbstractJetParsingTest extends ParsingTestCase { } }); - doCheckResult(myFullDataPath, filePath.replace(".jet", ".txt"), toParseTreeText(myFile, false, false).trim()); + doCheckResult(myFullDataPath, filePath.replace(".kt", ".txt"), toParseTreeText(myFile, false, false).trim()); } } diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java index cae148bb43b..347521f9bb7 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java @@ -31,488 +31,498 @@ import org.jetbrains.jet.parsing.AbstractJetParsingTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/psi") -@InnerTestClasses({JetParsingTestGenerated.Examples.class, JetParsingTestGenerated.FunctionReceivers.class, JetParsingTestGenerated.GreatSyntacticShift.class, JetParsingTestGenerated.Kdoc.class, JetParsingTestGenerated.Recovery.class}) +@InnerTestClasses({JetParsingTestGenerated.Examples.class, JetParsingTestGenerated.FunctionReceivers.class, JetParsingTestGenerated.GreatSyntacticShift.class, JetParsingTestGenerated.Kdoc.class, JetParsingTestGenerated.PropertyDelegate.class, JetParsingTestGenerated.Recovery.class}) public class JetParsingTestGenerated extends AbstractJetParsingTest { public void testAllFilesPresentInPsi() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("AnnotatedExpressions.jet") + @TestMetadata("AnnotatedExpressions.kt") public void testAnnotatedExpressions() throws Exception { - doParsingTest("compiler/testData/psi/AnnotatedExpressions.jet"); + doParsingTest("compiler/testData/psi/AnnotatedExpressions.kt"); } - @TestMetadata("AnonymousInitializer.jet") + @TestMetadata("AnonymousInitializer.kt") public void testAnonymousInitializer() throws Exception { - doParsingTest("compiler/testData/psi/AnonymousInitializer.jet"); + doParsingTest("compiler/testData/psi/AnonymousInitializer.kt"); } - @TestMetadata("AssertNotNull.jet") + @TestMetadata("AssertNotNull.kt") public void testAssertNotNull() throws Exception { - doParsingTest("compiler/testData/psi/AssertNotNull.jet"); + doParsingTest("compiler/testData/psi/AssertNotNull.kt"); } - @TestMetadata("Attributes.jet") + @TestMetadata("Attributes.kt") public void testAttributes() throws Exception { - doParsingTest("compiler/testData/psi/Attributes.jet"); + doParsingTest("compiler/testData/psi/Attributes.kt"); } - @TestMetadata("AttributesOnPatterns.jet") + @TestMetadata("AttributesOnPatterns.kt") public void testAttributesOnPatterns() throws Exception { - doParsingTest("compiler/testData/psi/AttributesOnPatterns.jet"); + doParsingTest("compiler/testData/psi/AttributesOnPatterns.kt"); } - @TestMetadata("Attributes_ERR.jet") + @TestMetadata("Attributes_ERR.kt") public void testAttributes_ERR() throws Exception { - doParsingTest("compiler/testData/psi/Attributes_ERR.jet"); + doParsingTest("compiler/testData/psi/Attributes_ERR.kt"); } - @TestMetadata("BabySteps.jet") + @TestMetadata("BabySteps.kt") public void testBabySteps() throws Exception { - doParsingTest("compiler/testData/psi/BabySteps.jet"); + doParsingTest("compiler/testData/psi/BabySteps.kt"); } - @TestMetadata("BabySteps_ERR.jet") + @TestMetadata("BabySteps_ERR.kt") public void testBabySteps_ERR() throws Exception { - doParsingTest("compiler/testData/psi/BabySteps_ERR.jet"); + doParsingTest("compiler/testData/psi/BabySteps_ERR.kt"); } - @TestMetadata("BlockCommentAtBeginningOfFile1.jet") + @TestMetadata("BlockCommentAtBeginningOfFile1.kt") public void testBlockCommentAtBeginningOfFile1() throws Exception { - doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile1.jet"); + doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt"); } - @TestMetadata("BlockCommentAtBeginningOfFile2.jet") + @TestMetadata("BlockCommentAtBeginningOfFile2.kt") public void testBlockCommentAtBeginningOfFile2() throws Exception { - doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile2.jet"); + doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt"); } - @TestMetadata("BlockCommentAtBeginningOfFile3.jet") + @TestMetadata("BlockCommentAtBeginningOfFile3.kt") public void testBlockCommentAtBeginningOfFile3() throws Exception { - doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile3.jet"); + doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt"); } - @TestMetadata("BlockCommentAtBeginningOfFile4.jet") + @TestMetadata("BlockCommentAtBeginningOfFile4.kt") public void testBlockCommentAtBeginningOfFile4() throws Exception { - doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile4.jet"); + doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt"); } - @TestMetadata("ByCaluses.jet") + @TestMetadata("ByCaluses.kt") public void testByCaluses() throws Exception { - doParsingTest("compiler/testData/psi/ByCaluses.jet"); + doParsingTest("compiler/testData/psi/ByCaluses.kt"); } - @TestMetadata("CallWithManyClosures.jet") + @TestMetadata("CallWithManyClosures.kt") public void testCallWithManyClosures() throws Exception { - doParsingTest("compiler/testData/psi/CallWithManyClosures.jet"); + doParsingTest("compiler/testData/psi/CallWithManyClosures.kt"); } - @TestMetadata("CallsInWhen.jet") + @TestMetadata("CallsInWhen.kt") public void testCallsInWhen() throws Exception { - doParsingTest("compiler/testData/psi/CallsInWhen.jet"); + doParsingTest("compiler/testData/psi/CallsInWhen.kt"); } - @TestMetadata("Constructors.jet") + @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { - doParsingTest("compiler/testData/psi/Constructors.jet"); + doParsingTest("compiler/testData/psi/Constructors.kt"); } - @TestMetadata("ControlStructures.jet") + @TestMetadata("ControlStructures.kt") public void testControlStructures() throws Exception { - doParsingTest("compiler/testData/psi/ControlStructures.jet"); + doParsingTest("compiler/testData/psi/ControlStructures.kt"); } - @TestMetadata("DoubleColon.jet") + @TestMetadata("DoubleColon.kt") public void testDoubleColon() throws Exception { - doParsingTest("compiler/testData/psi/DoubleColon.jet"); + doParsingTest("compiler/testData/psi/DoubleColon.kt"); } - @TestMetadata("EOLsInComments.jet") + @TestMetadata("EOLsInComments.kt") public void testEOLsInComments() throws Exception { - doParsingTest("compiler/testData/psi/EOLsInComments.jet"); + doParsingTest("compiler/testData/psi/EOLsInComments.kt"); } - @TestMetadata("EOLsOnRollback.jet") + @TestMetadata("EOLsOnRollback.kt") public void testEOLsOnRollback() throws Exception { - doParsingTest("compiler/testData/psi/EOLsOnRollback.jet"); + doParsingTest("compiler/testData/psi/EOLsOnRollback.kt"); } - @TestMetadata("EmptyFile.jet") + @TestMetadata("EmptyFile.kt") public void testEmptyFile() throws Exception { - doParsingTest("compiler/testData/psi/EmptyFile.jet"); + doParsingTest("compiler/testData/psi/EmptyFile.kt"); } - @TestMetadata("Enums.jet") + @TestMetadata("Enums.kt") public void testEnums() throws Exception { - doParsingTest("compiler/testData/psi/Enums.jet"); + doParsingTest("compiler/testData/psi/Enums.kt"); } - @TestMetadata("Expressions_ERR.jet") + @TestMetadata("Expressions_ERR.kt") public void testExpressions_ERR() throws Exception { - doParsingTest("compiler/testData/psi/Expressions_ERR.jet"); + doParsingTest("compiler/testData/psi/Expressions_ERR.kt"); } - @TestMetadata("ExtensionsWithQNReceiver.jet") + @TestMetadata("ExtensionsWithQNReceiver.kt") public void testExtensionsWithQNReceiver() throws Exception { - doParsingTest("compiler/testData/psi/ExtensionsWithQNReceiver.jet"); + doParsingTest("compiler/testData/psi/ExtensionsWithQNReceiver.kt"); } - @TestMetadata("FileStart_ERR.jet") + @TestMetadata("FileStart_ERR.kt") public void testFileStart_ERR() throws Exception { - doParsingTest("compiler/testData/psi/FileStart_ERR.jet"); + doParsingTest("compiler/testData/psi/FileStart_ERR.kt"); } - @TestMetadata("ForWithMultiDecl.jet") + @TestMetadata("ForWithMultiDecl.kt") public void testForWithMultiDecl() throws Exception { - doParsingTest("compiler/testData/psi/ForWithMultiDecl.jet"); + doParsingTest("compiler/testData/psi/ForWithMultiDecl.kt"); } - @TestMetadata("FunctionCalls.jet") + @TestMetadata("FunctionCalls.kt") public void testFunctionCalls() throws Exception { - doParsingTest("compiler/testData/psi/FunctionCalls.jet"); + doParsingTest("compiler/testData/psi/FunctionCalls.kt"); } - @TestMetadata("FunctionLiterals.jet") + @TestMetadata("FunctionLiterals.kt") public void testFunctionLiterals() throws Exception { - doParsingTest("compiler/testData/psi/FunctionLiterals.jet"); + doParsingTest("compiler/testData/psi/FunctionLiterals.kt"); } - @TestMetadata("FunctionLiterals_ERR.jet") + @TestMetadata("FunctionLiterals_ERR.kt") public void testFunctionLiterals_ERR() throws Exception { - doParsingTest("compiler/testData/psi/FunctionLiterals_ERR.jet"); + doParsingTest("compiler/testData/psi/FunctionLiterals_ERR.kt"); } - @TestMetadata("FunctionTypes.jet") + @TestMetadata("FunctionNoParameterList.kt") + public void testFunctionNoParameterList() throws Exception { + doParsingTest("compiler/testData/psi/FunctionNoParameterList.kt"); + } + + @TestMetadata("FunctionTypes.kt") public void testFunctionTypes() throws Exception { - doParsingTest("compiler/testData/psi/FunctionTypes.jet"); + doParsingTest("compiler/testData/psi/FunctionTypes.kt"); } - @TestMetadata("FunctionTypes_ERR.jet") + @TestMetadata("FunctionTypes_ERR.kt") public void testFunctionTypes_ERR() throws Exception { - doParsingTest("compiler/testData/psi/FunctionTypes_ERR.jet"); + doParsingTest("compiler/testData/psi/FunctionTypes_ERR.kt"); } - @TestMetadata("Functions.jet") + @TestMetadata("Functions.kt") public void testFunctions() throws Exception { - doParsingTest("compiler/testData/psi/Functions.jet"); + doParsingTest("compiler/testData/psi/Functions.kt"); } - @TestMetadata("Functions_ERR.jet") + @TestMetadata("Functions_ERR.kt") public void testFunctions_ERR() throws Exception { - doParsingTest("compiler/testData/psi/Functions_ERR.jet"); + doParsingTest("compiler/testData/psi/Functions_ERR.kt"); } - @TestMetadata("HangOnLonelyModifier.jet") + @TestMetadata("HangOnLonelyModifier.kt") public void testHangOnLonelyModifier() throws Exception { - doParsingTest("compiler/testData/psi/HangOnLonelyModifier.jet"); + doParsingTest("compiler/testData/psi/HangOnLonelyModifier.kt"); } - @TestMetadata("IfWithPropery.jet") + @TestMetadata("IfWithPropery.kt") public void testIfWithPropery() throws Exception { - doParsingTest("compiler/testData/psi/IfWithPropery.jet"); + doParsingTest("compiler/testData/psi/IfWithPropery.kt"); } - @TestMetadata("ImportSoftKW.jet") + @TestMetadata("ImportSoftKW.kt") public void testImportSoftKW() throws Exception { - doParsingTest("compiler/testData/psi/ImportSoftKW.jet"); + doParsingTest("compiler/testData/psi/ImportSoftKW.kt"); } - @TestMetadata("Imports.jet") + @TestMetadata("Imports.kt") public void testImports() throws Exception { - doParsingTest("compiler/testData/psi/Imports.jet"); + doParsingTest("compiler/testData/psi/Imports.kt"); } - @TestMetadata("Imports_ERR.jet") + @TestMetadata("Imports_ERR.kt") public void testImports_ERR() throws Exception { - doParsingTest("compiler/testData/psi/Imports_ERR.jet"); + doParsingTest("compiler/testData/psi/Imports_ERR.kt"); } - @TestMetadata("Inner.jet") + @TestMetadata("Inner.kt") public void testInner() throws Exception { - doParsingTest("compiler/testData/psi/Inner.jet"); + doParsingTest("compiler/testData/psi/Inner.kt"); } - @TestMetadata("Labels.jet") + @TestMetadata("Labels.kt") public void testLabels() throws Exception { - doParsingTest("compiler/testData/psi/Labels.jet"); + doParsingTest("compiler/testData/psi/Labels.kt"); } - @TestMetadata("LocalDeclarations.jet") + @TestMetadata("LocalDeclarations.kt") public void testLocalDeclarations() throws Exception { - doParsingTest("compiler/testData/psi/LocalDeclarations.jet"); + doParsingTest("compiler/testData/psi/LocalDeclarations.kt"); } - @TestMetadata("ModifierAsSelector.jet") + @TestMetadata("ModifierAsSelector.kt") public void testModifierAsSelector() throws Exception { - doParsingTest("compiler/testData/psi/ModifierAsSelector.jet"); + doParsingTest("compiler/testData/psi/ModifierAsSelector.kt"); } - @TestMetadata("MultiVariableDeclarations.jet") + @TestMetadata("MultiVariableDeclarations.kt") public void testMultiVariableDeclarations() throws Exception { - doParsingTest("compiler/testData/psi/MultiVariableDeclarations.jet"); + doParsingTest("compiler/testData/psi/MultiVariableDeclarations.kt"); } - @TestMetadata("NamespaceBlockFirst.jet") + @TestMetadata("NamespaceBlockFirst.kt") public void testNamespaceBlockFirst() throws Exception { - doParsingTest("compiler/testData/psi/NamespaceBlockFirst.jet"); + doParsingTest("compiler/testData/psi/NamespaceBlockFirst.kt"); } - @TestMetadata("NamespaceModifiers.jet") + @TestMetadata("NamespaceModifiers.kt") public void testNamespaceModifiers() throws Exception { - doParsingTest("compiler/testData/psi/NamespaceModifiers.jet"); + doParsingTest("compiler/testData/psi/NamespaceModifiers.kt"); } - @TestMetadata("NestedComments.jet") + @TestMetadata("NestedComments.kt") public void testNestedComments() throws Exception { - doParsingTest("compiler/testData/psi/NestedComments.jet"); + doParsingTest("compiler/testData/psi/NestedComments.kt"); } - @TestMetadata("NewLinesValidOperations.jet") + @TestMetadata("NewLinesValidOperations.kt") public void testNewLinesValidOperations() throws Exception { - doParsingTest("compiler/testData/psi/NewLinesValidOperations.jet"); + doParsingTest("compiler/testData/psi/NewLinesValidOperations.kt"); } - @TestMetadata("NewlinesInParentheses.jet") + @TestMetadata("NewlinesInParentheses.kt") public void testNewlinesInParentheses() throws Exception { - doParsingTest("compiler/testData/psi/NewlinesInParentheses.jet"); + doParsingTest("compiler/testData/psi/NewlinesInParentheses.kt"); } - @TestMetadata("NotIsAndNotIn.jet") + @TestMetadata("NotIsAndNotIn.kt") public void testNotIsAndNotIn() throws Exception { - doParsingTest("compiler/testData/psi/NotIsAndNotIn.jet"); + doParsingTest("compiler/testData/psi/NotIsAndNotIn.kt"); } - @TestMetadata("ObjectLiteralAsStatement.jet") + @TestMetadata("ObjectLiteralAsStatement.kt") public void testObjectLiteralAsStatement() throws Exception { - doParsingTest("compiler/testData/psi/ObjectLiteralAsStatement.jet"); + doParsingTest("compiler/testData/psi/ObjectLiteralAsStatement.kt"); } - @TestMetadata("Precedence.jet") + @TestMetadata("ParameterNameMising.kt") + public void testParameterNameMising() throws Exception { + doParsingTest("compiler/testData/psi/ParameterNameMising.kt"); + } + + @TestMetadata("Precedence.kt") public void testPrecedence() throws Exception { - doParsingTest("compiler/testData/psi/Precedence.jet"); + doParsingTest("compiler/testData/psi/Precedence.kt"); } - @TestMetadata("PrimaryConstructorModifiers_ERR.jet") + @TestMetadata("PrimaryConstructorModifiers_ERR.kt") public void testPrimaryConstructorModifiers_ERR() throws Exception { - doParsingTest("compiler/testData/psi/PrimaryConstructorModifiers_ERR.jet"); + doParsingTest("compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt"); } - @TestMetadata("Properties.jet") + @TestMetadata("Properties.kt") public void testProperties() throws Exception { - doParsingTest("compiler/testData/psi/Properties.jet"); + doParsingTest("compiler/testData/psi/Properties.kt"); } - @TestMetadata("PropertiesFollowedByInitializers.jet") + @TestMetadata("PropertiesFollowedByInitializers.kt") public void testPropertiesFollowedByInitializers() throws Exception { - doParsingTest("compiler/testData/psi/PropertiesFollowedByInitializers.jet"); + doParsingTest("compiler/testData/psi/PropertiesFollowedByInitializers.kt"); } - @TestMetadata("Properties_ERR.jet") + @TestMetadata("Properties_ERR.kt") public void testProperties_ERR() throws Exception { - doParsingTest("compiler/testData/psi/Properties_ERR.jet"); + doParsingTest("compiler/testData/psi/Properties_ERR.kt"); } - @TestMetadata("QuotedIdentifiers.jet") + @TestMetadata("QuotedIdentifiers.kt") public void testQuotedIdentifiers() throws Exception { - doParsingTest("compiler/testData/psi/QuotedIdentifiers.jet"); + doParsingTest("compiler/testData/psi/QuotedIdentifiers.kt"); } - @TestMetadata("RootNamespace.jet") + @TestMetadata("RootNamespace.kt") public void testRootNamespace() throws Exception { - doParsingTest("compiler/testData/psi/RootNamespace.jet"); + doParsingTest("compiler/testData/psi/RootNamespace.kt"); } - @TestMetadata("SemicolonAfterIf.jet") + @TestMetadata("SemicolonAfterIf.kt") public void testSemicolonAfterIf() throws Exception { - doParsingTest("compiler/testData/psi/SemicolonAfterIf.jet"); + doParsingTest("compiler/testData/psi/SemicolonAfterIf.kt"); } - @TestMetadata("ShortAnnotations.jet") + @TestMetadata("ShortAnnotations.kt") public void testShortAnnotations() throws Exception { - doParsingTest("compiler/testData/psi/ShortAnnotations.jet"); + doParsingTest("compiler/testData/psi/ShortAnnotations.kt"); } - @TestMetadata("SimpleClassMembers.jet") + @TestMetadata("SimpleClassMembers.kt") public void testSimpleClassMembers() throws Exception { - doParsingTest("compiler/testData/psi/SimpleClassMembers.jet"); + doParsingTest("compiler/testData/psi/SimpleClassMembers.kt"); } - @TestMetadata("SimpleClassMembers_ERR.jet") + @TestMetadata("SimpleClassMembers_ERR.kt") public void testSimpleClassMembers_ERR() throws Exception { - doParsingTest("compiler/testData/psi/SimpleClassMembers_ERR.jet"); + doParsingTest("compiler/testData/psi/SimpleClassMembers_ERR.kt"); } - @TestMetadata("SimpleExpressions.jet") + @TestMetadata("SimpleExpressions.kt") public void testSimpleExpressions() throws Exception { - doParsingTest("compiler/testData/psi/SimpleExpressions.jet"); + doParsingTest("compiler/testData/psi/SimpleExpressions.kt"); } - @TestMetadata("SimpleModifiers.jet") + @TestMetadata("SimpleModifiers.kt") public void testSimpleModifiers() throws Exception { - doParsingTest("compiler/testData/psi/SimpleModifiers.jet"); + doParsingTest("compiler/testData/psi/SimpleModifiers.kt"); } - @TestMetadata("SoftKeywords.jet") + @TestMetadata("SoftKeywords.kt") public void testSoftKeywords() throws Exception { - doParsingTest("compiler/testData/psi/SoftKeywords.jet"); + doParsingTest("compiler/testData/psi/SoftKeywords.kt"); } - @TestMetadata("SoftKeywordsInTypeArguments.jet") + @TestMetadata("SoftKeywordsInTypeArguments.kt") public void testSoftKeywordsInTypeArguments() throws Exception { - doParsingTest("compiler/testData/psi/SoftKeywordsInTypeArguments.jet"); + doParsingTest("compiler/testData/psi/SoftKeywordsInTypeArguments.kt"); } - @TestMetadata("StringTemplates.jet") + @TestMetadata("StringTemplates.kt") public void testStringTemplates() throws Exception { - doParsingTest("compiler/testData/psi/StringTemplates.jet"); + doParsingTest("compiler/testData/psi/StringTemplates.kt"); } - @TestMetadata("Super.jet") + @TestMetadata("Super.kt") public void testSuper() throws Exception { - doParsingTest("compiler/testData/psi/Super.jet"); + doParsingTest("compiler/testData/psi/Super.kt"); } - @TestMetadata("ThisType.jet") + @TestMetadata("ThisType.kt") public void testThisType() throws Exception { - doParsingTest("compiler/testData/psi/ThisType.jet"); + doParsingTest("compiler/testData/psi/ThisType.kt"); } - @TestMetadata("TryRecovery.jet") + @TestMetadata("TryRecovery.kt") public void testTryRecovery() throws Exception { - doParsingTest("compiler/testData/psi/TryRecovery.jet"); + doParsingTest("compiler/testData/psi/TryRecovery.kt"); } - @TestMetadata("TypeAnnotations.jet") + @TestMetadata("TypeAnnotations.kt") public void testTypeAnnotations() throws Exception { - doParsingTest("compiler/testData/psi/TypeAnnotations.jet"); + doParsingTest("compiler/testData/psi/TypeAnnotations.kt"); } - @TestMetadata("TypeConstraints.jet") + @TestMetadata("TypeConstraints.kt") public void testTypeConstraints() throws Exception { - doParsingTest("compiler/testData/psi/TypeConstraints.jet"); + doParsingTest("compiler/testData/psi/TypeConstraints.kt"); } - @TestMetadata("TypeDef.jet") + @TestMetadata("TypeDef.kt") public void testTypeDef() throws Exception { - doParsingTest("compiler/testData/psi/TypeDef.jet"); + doParsingTest("compiler/testData/psi/TypeDef.kt"); } - @TestMetadata("TypeDef_ERR.jet") + @TestMetadata("TypeDef_ERR.kt") public void testTypeDef_ERR() throws Exception { - doParsingTest("compiler/testData/psi/TypeDef_ERR.jet"); + doParsingTest("compiler/testData/psi/TypeDef_ERR.kt"); } - @TestMetadata("TypeExpressionAmbiguities_ERR.jet") + @TestMetadata("TypeExpressionAmbiguities_ERR.kt") public void testTypeExpressionAmbiguities_ERR() throws Exception { - doParsingTest("compiler/testData/psi/TypeExpressionAmbiguities_ERR.jet"); + doParsingTest("compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt"); } - @TestMetadata("TypeParametersBeforeName.jet") + @TestMetadata("TypeParametersBeforeName.kt") public void testTypeParametersBeforeName() throws Exception { - doParsingTest("compiler/testData/psi/TypeParametersBeforeName.jet"); + doParsingTest("compiler/testData/psi/TypeParametersBeforeName.kt"); } - @TestMetadata("When.jet") + @TestMetadata("When.kt") public void testWhen() throws Exception { - doParsingTest("compiler/testData/psi/When.jet"); + doParsingTest("compiler/testData/psi/When.kt"); } - @TestMetadata("When_ERR.jet") + @TestMetadata("When_ERR.kt") public void testWhen_ERR() throws Exception { - doParsingTest("compiler/testData/psi/When_ERR.jet"); + doParsingTest("compiler/testData/psi/When_ERR.kt"); } @TestMetadata("compiler/testData/psi/examples") @InnerTestClasses({Examples.Array.class, Examples.Collections.class, Examples.Io.class, Examples.Map.class, Examples.Priorityqueues.class, Examples.Util.class}) public static class Examples extends AbstractJetParsingTest { public void testAllFilesPresentInExamples() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("AnonymousObjects.jet") + @TestMetadata("AnonymousObjects.kt") public void testAnonymousObjects() throws Exception { - doParsingTest("compiler/testData/psi/examples/AnonymousObjects.jet"); + doParsingTest("compiler/testData/psi/examples/AnonymousObjects.kt"); } - @TestMetadata("BinaryTree.jet") + @TestMetadata("BinaryTree.kt") public void testBinaryTree() throws Exception { - doParsingTest("compiler/testData/psi/examples/BinaryTree.jet"); + doParsingTest("compiler/testData/psi/examples/BinaryTree.kt"); } - @TestMetadata("BitArith.jet") + @TestMetadata("BitArith.kt") public void testBitArith() throws Exception { - doParsingTest("compiler/testData/psi/examples/BitArith.jet"); + doParsingTest("compiler/testData/psi/examples/BitArith.kt"); } - @TestMetadata("Builder.jet") + @TestMetadata("Builder.kt") public void testBuilder() throws Exception { - doParsingTest("compiler/testData/psi/examples/Builder.jet"); + doParsingTest("compiler/testData/psi/examples/Builder.kt"); } - @TestMetadata("Color.jet") + @TestMetadata("Color.kt") public void testColor() throws Exception { - doParsingTest("compiler/testData/psi/examples/Color.jet"); + doParsingTest("compiler/testData/psi/examples/Color.kt"); } - @TestMetadata("FunctionsAndTypes.jet") + @TestMetadata("FunctionsAndTypes.kt") public void testFunctionsAndTypes() throws Exception { - doParsingTest("compiler/testData/psi/examples/FunctionsAndTypes.jet"); + doParsingTest("compiler/testData/psi/examples/FunctionsAndTypes.kt"); } - @TestMetadata("Graph.jet") + @TestMetadata("Graph.kt") public void testGraph() throws Exception { - doParsingTest("compiler/testData/psi/examples/Graph.jet"); + doParsingTest("compiler/testData/psi/examples/Graph.kt"); } - @TestMetadata("IPushPop.jet") + @TestMetadata("IPushPop.kt") public void testIPushPop() throws Exception { - doParsingTest("compiler/testData/psi/examples/IPushPop.jet"); + doParsingTest("compiler/testData/psi/examples/IPushPop.kt"); } - @TestMetadata("LINQ.jet") + @TestMetadata("LINQ.kt") public void testLINQ() throws Exception { - doParsingTest("compiler/testData/psi/examples/LINQ.jet"); + doParsingTest("compiler/testData/psi/examples/LINQ.kt"); } - @TestMetadata("PolymorphicClassObjects.jet") + @TestMetadata("PolymorphicClassObjects.kt") public void testPolymorphicClassObjects() throws Exception { - doParsingTest("compiler/testData/psi/examples/PolymorphicClassObjects.jet"); + doParsingTest("compiler/testData/psi/examples/PolymorphicClassObjects.kt"); } - @TestMetadata("Queue.jet") + @TestMetadata("Queue.kt") public void testQueue() throws Exception { - doParsingTest("compiler/testData/psi/examples/Queue.jet"); + doParsingTest("compiler/testData/psi/examples/Queue.kt"); } - @TestMetadata("Stack.jet") + @TestMetadata("Stack.kt") public void testStack() throws Exception { - doParsingTest("compiler/testData/psi/examples/Stack.jet"); + doParsingTest("compiler/testData/psi/examples/Stack.kt"); } - @TestMetadata("UnionFind.jet") + @TestMetadata("UnionFind.kt") public void testUnionFind() throws Exception { - doParsingTest("compiler/testData/psi/examples/UnionFind.jet"); + doParsingTest("compiler/testData/psi/examples/UnionFind.kt"); } - @TestMetadata("UpdateOperation.jet") + @TestMetadata("UpdateOperation.kt") public void testUpdateOperation() throws Exception { - doParsingTest("compiler/testData/psi/examples/UpdateOperation.jet"); + doParsingTest("compiler/testData/psi/examples/UpdateOperation.kt"); } - @TestMetadata("With.jet") + @TestMetadata("With.kt") public void testWith() throws Exception { - doParsingTest("compiler/testData/psi/examples/With.jet"); + doParsingTest("compiler/testData/psi/examples/With.kt"); } @TestMetadata("compiler/testData/psi/examples/array") public static class Array extends AbstractJetParsingTest { public void testAllFilesPresentInArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/array"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/array"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("MutableArray.jet") + @TestMetadata("MutableArray.kt") public void testMutableArray() throws Exception { - doParsingTest("compiler/testData/psi/examples/array/MutableArray.jet"); + doParsingTest("compiler/testData/psi/examples/array/MutableArray.kt"); } } @@ -520,67 +530,67 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/collections") public static class Collections extends AbstractJetParsingTest { public void testAllFilesPresentInCollections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/collections"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/collections"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("ArrayList.jet") + @TestMetadata("ArrayList.kt") public void testArrayList() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/ArrayList.jet"); + doParsingTest("compiler/testData/psi/examples/collections/ArrayList.kt"); } - @TestMetadata("HashMap.jet") + @TestMetadata("HashMap.kt") public void testHashMap() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/HashMap.jet"); + doParsingTest("compiler/testData/psi/examples/collections/HashMap.kt"); } - @TestMetadata("IIterable.jet") + @TestMetadata("IIterable.kt") public void testIIterable() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IIterable.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IIterable.kt"); } - @TestMetadata("IIterator.jet") + @TestMetadata("IIterator.kt") public void testIIterator() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IIterator.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IIterator.kt"); } - @TestMetadata("IList.jet") + @TestMetadata("IList.kt") public void testIList() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IList.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IList.kt"); } - @TestMetadata("IMutableIterable.jet") + @TestMetadata("IMutableIterable.kt") public void testIMutableIterable() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IMutableIterable.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IMutableIterable.kt"); } - @TestMetadata("IMutableIterator.jet") + @TestMetadata("IMutableIterator.kt") public void testIMutableIterator() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IMutableIterator.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IMutableIterator.kt"); } - @TestMetadata("IMutableList.jet") + @TestMetadata("IMutableList.kt") public void testIMutableList() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IMutableList.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IMutableList.kt"); } - @TestMetadata("IMutableSet.jet") + @TestMetadata("IMutableSet.kt") public void testIMutableSet() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/IMutableSet.jet"); + doParsingTest("compiler/testData/psi/examples/collections/IMutableSet.kt"); } - @TestMetadata("ISet.jet") + @TestMetadata("ISet.kt") public void testISet() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/ISet.jet"); + doParsingTest("compiler/testData/psi/examples/collections/ISet.kt"); } - @TestMetadata("ISized.jet") + @TestMetadata("ISized.kt") public void testISized() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/ISized.jet"); + doParsingTest("compiler/testData/psi/examples/collections/ISized.kt"); } - @TestMetadata("LinkedList.jet") + @TestMetadata("LinkedList.kt") public void testLinkedList() throws Exception { - doParsingTest("compiler/testData/psi/examples/collections/LinkedList.jet"); + doParsingTest("compiler/testData/psi/examples/collections/LinkedList.kt"); } } @@ -588,12 +598,12 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/io") public static class Io extends AbstractJetParsingTest { public void testAllFilesPresentInIo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/io"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/io"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("IOSamples.jet") + @TestMetadata("IOSamples.kt") public void testIOSamples() throws Exception { - doParsingTest("compiler/testData/psi/examples/io/IOSamples.jet"); + doParsingTest("compiler/testData/psi/examples/io/IOSamples.kt"); } } @@ -601,12 +611,12 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/map") public static class Map extends AbstractJetParsingTest { public void testAllFilesPresentInMap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/map"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/map"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("IMap.jet") + @TestMetadata("IMap.kt") public void testIMap() throws Exception { - doParsingTest("compiler/testData/psi/examples/map/IMap.jet"); + doParsingTest("compiler/testData/psi/examples/map/IMap.kt"); } } @@ -614,22 +624,22 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/priorityqueues") public static class Priorityqueues extends AbstractJetParsingTest { public void testAllFilesPresentInPriorityqueues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/priorityqueues"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/priorityqueues"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("BinaryHeap.jet") + @TestMetadata("BinaryHeap.kt") public void testBinaryHeap() throws Exception { - doParsingTest("compiler/testData/psi/examples/priorityqueues/BinaryHeap.jet"); + doParsingTest("compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt"); } - @TestMetadata("IPriorityQueue.jet") + @TestMetadata("IPriorityQueue.kt") public void testIPriorityQueue() throws Exception { - doParsingTest("compiler/testData/psi/examples/priorityqueues/IPriorityQueue.jet"); + doParsingTest("compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt"); } - @TestMetadata("PriorityQueueAsPushPop.jet") + @TestMetadata("PriorityQueueAsPushPop.kt") public void testPriorityQueueAsPushPop() throws Exception { - doParsingTest("compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.jet"); + doParsingTest("compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt"); } } @@ -637,17 +647,17 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/util") public static class Util extends AbstractJetParsingTest { public void testAllFilesPresentInUtil() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/util"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/examples/util"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("Comparison.jet") + @TestMetadata("Comparison.kt") public void testComparison() throws Exception { - doParsingTest("compiler/testData/psi/examples/util/Comparison.jet"); + doParsingTest("compiler/testData/psi/examples/util/Comparison.kt"); } - @TestMetadata("IComparable.jet") + @TestMetadata("IComparable.kt") public void testIComparable() throws Exception { - doParsingTest("compiler/testData/psi/examples/util/IComparable.jet"); + doParsingTest("compiler/testData/psi/examples/util/IComparable.kt"); } } @@ -668,22 +678,22 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/functionReceivers") public static class FunctionReceivers extends AbstractJetParsingTest { public void testAllFilesPresentInFunctionReceivers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/functionReceivers"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/functionReceivers"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("FunctionTypesWithFunctionReceivers.jet") + @TestMetadata("FunctionTypesWithFunctionReceivers.kt") public void testFunctionTypesWithFunctionReceivers() throws Exception { - doParsingTest("compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.jet"); + doParsingTest("compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt"); } - @TestMetadata("FunctionsWithFunctionReceivers.jet") + @TestMetadata("FunctionsWithFunctionReceivers.kt") public void testFunctionsWithFunctionReceivers() throws Exception { - doParsingTest("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.jet"); + doParsingTest("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt"); } - @TestMetadata("PropertiesWithFunctionReceivers.jet") + @TestMetadata("PropertiesWithFunctionReceivers.kt") public void testPropertiesWithFunctionReceivers() throws Exception { - doParsingTest("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.jet"); + doParsingTest("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt"); } } @@ -691,22 +701,22 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/greatSyntacticShift") public static class GreatSyntacticShift extends AbstractJetParsingTest { public void testAllFilesPresentInGreatSyntacticShift() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/greatSyntacticShift"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/greatSyntacticShift"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("functionLiterals.jet") + @TestMetadata("functionLiterals.kt") public void testFunctionLiterals() throws Exception { - doParsingTest("compiler/testData/psi/greatSyntacticShift/functionLiterals.jet"); + doParsingTest("compiler/testData/psi/greatSyntacticShift/functionLiterals.kt"); } - @TestMetadata("functionTypes.jet") + @TestMetadata("functionTypes.kt") public void testFunctionTypes() throws Exception { - doParsingTest("compiler/testData/psi/greatSyntacticShift/functionTypes.jet"); + doParsingTest("compiler/testData/psi/greatSyntacticShift/functionTypes.kt"); } - @TestMetadata("FunctionTypesAsArguments.jet") + @TestMetadata("FunctionTypesAsArguments.kt") public void testFunctionTypesAsArguments() throws Exception { - doParsingTest("compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.jet"); + doParsingTest("compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt"); } } @@ -714,65 +724,173 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/kdoc") public static class Kdoc extends AbstractJetParsingTest { public void testAllFilesPresentInKdoc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/kdoc"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/kdoc"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("AtTags.jet") + @TestMetadata("AtTags.kt") public void testAtTags() throws Exception { - doParsingTest("compiler/testData/psi/kdoc/AtTags.jet"); + doParsingTest("compiler/testData/psi/kdoc/AtTags.kt"); } - @TestMetadata("DocCommentAtBeginningOfFile1.jet") + @TestMetadata("DocCommentAtBeginningOfFile1.kt") public void testDocCommentAtBeginningOfFile1() throws Exception { - doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.jet"); + doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt"); } - @TestMetadata("DocCommentAtBeginningOfFile2.jet") + @TestMetadata("DocCommentAtBeginningOfFile2.kt") public void testDocCommentAtBeginningOfFile2() throws Exception { - doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.jet"); + doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt"); } - @TestMetadata("DocCommentAtBeginningOfFile3.jet") + @TestMetadata("DocCommentAtBeginningOfFile3.kt") public void testDocCommentAtBeginningOfFile3() throws Exception { - doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.jet"); + doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt"); } - @TestMetadata("DocCommentAtBeginningOfFile4.jet") + @TestMetadata("DocCommentAtBeginningOfFile4.kt") public void testDocCommentAtBeginningOfFile4() throws Exception { - doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.jet"); + doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt"); } - @TestMetadata("Markdown.jet") + @TestMetadata("EndOnLeadingAsterisks.kt") + public void testEndOnLeadingAsterisks() throws Exception { + doParsingTest("compiler/testData/psi/kdoc/EndOnLeadingAsterisks.kt"); + } + + @TestMetadata("EndRightAfterText.kt") + public void testEndRightAfterText() throws Exception { + doParsingTest("compiler/testData/psi/kdoc/EndRightAfterText.kt"); + } + + @TestMetadata("Incomplete.kt") + public void testIncomplete() throws Exception { + doParsingTest("compiler/testData/psi/kdoc/Incomplete.kt"); + } + + @TestMetadata("Markdown.kt") public void testMarkdown() throws Exception { - doParsingTest("compiler/testData/psi/kdoc/Markdown.jet"); + doParsingTest("compiler/testData/psi/kdoc/Markdown.kt"); + } + + @TestMetadata("Simple.kt") + public void testSimple() throws Exception { + doParsingTest("compiler/testData/psi/kdoc/Simple.kt"); + } + + @TestMetadata("TextRightAfterLeadAsterisks.kt") + public void testTextRightAfterLeadAsterisks() throws Exception { + doParsingTest("compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.kt"); + } + + } + + @TestMetadata("compiler/testData/psi/propertyDelegate") + public static class PropertyDelegate extends AbstractJetParsingTest { + public void testAllFilesPresentInPropertyDelegate() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/propertyDelegate"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("BracketsInDelegate.kt") + public void testBracketsInDelegate() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/BracketsInDelegate.kt"); + } + + @TestMetadata("DelegateAndInitializer.kt") + public void testDelegateAndInitializer() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/DelegateAndInitializer.kt"); + } + + @TestMetadata("GetterInSameLine.kt") + public void testGetterInSameLine() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/GetterInSameLine.kt"); + } + + @TestMetadata("LocalProperty.kt") + public void testLocalProperty() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/LocalProperty.kt"); + } + + @TestMetadata("OnlyBy.kt") + public void testOnlyBy() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/OnlyBy.kt"); + } + + @TestMetadata("PropertyInClass.kt") + public void testPropertyInClass() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/PropertyInClass.kt"); + } + + @TestMetadata("PropertyWithGetter.kt") + public void testPropertyWithGetter() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/PropertyWithGetter.kt"); + } + + @TestMetadata("PropertyWithInitializer.kt") + public void testPropertyWithInitializer() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/PropertyWithInitializer.kt"); + } + + @TestMetadata("PropertyWithoutTypeRef.kt") + public void testPropertyWithoutTypeRef() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.kt"); + } + + @TestMetadata("TopLevelProperty.kt") + public void testTopLevelProperty() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/TopLevelProperty.kt"); + } + + @TestMetadata("TwoProperties.kt") + public void testTwoProperties() throws Exception { + doParsingTest("compiler/testData/psi/propertyDelegate/TwoProperties.kt"); } } @TestMetadata("compiler/testData/psi/recovery") public static class Recovery extends AbstractJetParsingTest { + @TestMetadata("AbsentLeftHandSide.kt") + public void testAbsentLeftHandSide() throws Exception { + doParsingTest("compiler/testData/psi/recovery/AbsentLeftHandSide.kt"); + } + public void testAllFilesPresentInRecovery() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/recovery"), Pattern.compile("^(.+)\\.jet$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/recovery"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("ImportRecovery.jet") + @TestMetadata("ForRecovery.kt") + public void testForRecovery() throws Exception { + doParsingTest("compiler/testData/psi/recovery/ForRecovery.kt"); + } + + @TestMetadata("ImportRecovery.kt") public void testImportRecovery() throws Exception { - doParsingTest("compiler/testData/psi/recovery/ImportRecovery.jet"); + doParsingTest("compiler/testData/psi/recovery/ImportRecovery.kt"); } - @TestMetadata("kt2172.jet") + @TestMetadata("kt2172.kt") public void testKt2172() throws Exception { - doParsingTest("compiler/testData/psi/recovery/kt2172.jet"); + doParsingTest("compiler/testData/psi/recovery/kt2172.kt"); } - @TestMetadata("PackageRecovery.jet") + @TestMetadata("MissingCommaInValueArgumentList.kt") + public void testMissingCommaInValueArgumentList() throws Exception { + doParsingTest("compiler/testData/psi/recovery/MissingCommaInValueArgumentList.kt"); + } + + @TestMetadata("MissingCommaInValueParameterList.kt") + public void testMissingCommaInValueParameterList() throws Exception { + doParsingTest("compiler/testData/psi/recovery/MissingCommaInValueParameterList.kt"); + } + + @TestMetadata("PackageRecovery.kt") public void testPackageRecovery() throws Exception { - doParsingTest("compiler/testData/psi/recovery/PackageRecovery.jet"); + doParsingTest("compiler/testData/psi/recovery/PackageRecovery.kt"); } - @TestMetadata("ValueParameterNoTypeRecovery.jet") + @TestMetadata("ValueParameterNoTypeRecovery.kt") public void testValueParameterNoTypeRecovery() throws Exception { - doParsingTest("compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.jet"); + doParsingTest("compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt"); } } @@ -784,6 +902,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { suite.addTestSuite(FunctionReceivers.class); suite.addTestSuite(GreatSyntacticShift.class); suite.addTestSuite(Kdoc.class); + suite.addTestSuite(PropertyDelegate.class); suite.addTestSuite(Recovery.class); return suite; } diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index a5595cff0b4..226eee30419 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -104,7 +104,7 @@ public class GenerateTests { "compiler/tests/", "JetParsingTestGenerated", AbstractJetParsingTest.class, - testModel("compiler/testData/psi", true, "jet", "doParsingTest") + testModel("compiler/testData/psi", true, "kt", "doParsingTest") ); GenerateRangesCodegenTestData.main(args);