Minor: JetFile -> KtFile

Author: goodwinnk

compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java

@@ -213,7 +213,7 @@ private static Collection<KtFile> allFilesInPackages(BindingContext bindingConte
 
         sortedAnswer.sort(Comparator.comparing((KtFile file) -> {
             VirtualFile virtualFile = file.getVirtualFile();
-            assert virtualFile != null : "VirtualFile is null for JetFile: " + file.getName();
+            assert virtualFile != null : "VirtualFile is null for KtFile: " + file.getName();
             return virtualFile.getPath();
         }));
 

compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java

@@ -70,7 +70,7 @@ public FileType getFileType() {
 
     @Override
     public String toString() {
-        return "JetFile: " + getName();
+        return "KtFile: " + getName();
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java

@@ -81,7 +81,7 @@ public FqName getContainingPackageFqName() {
             KtFile jetFile = (KtFile) file;
             return jetFile.getPackageFqName();
         }
-        throw new IllegalArgumentException("Not in a JetFile: " + element);
+        throw new IllegalArgumentException("Not in a KtFile: " + element);
     }
 
     @NotNull

compiler/testData/parseCodeFragment/block/expressionOnTopLevel.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')

compiler/testData/parseCodeFragment/block/imports.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PsiErrorElement:Package directive and imports are forbidden in code fragments
       PACKAGE_DIRECTIVE

compiler/testData/parseCodeFragment/block/localFun.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     FUN
       PsiElement(fun)('fun')

compiler/testData/parseCodeFragment/block/oneLine.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')

compiler/testData/parseCodeFragment/block/oneStatement.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')

compiler/testData/parseCodeFragment/block/packageAndImport.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PsiErrorElement:Package directive and imports are forbidden in code fragments
       PACKAGE_DIRECTIVE

compiler/testData/parseCodeFragment/block/packageDirective.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PsiErrorElement:Package directive and imports are forbidden in code fragments
       PACKAGE_DIRECTIVE

compiler/testData/parseCodeFragment/block/severalExpressions.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     BINARY_EXPRESSION
       INTEGER_CONSTANT

compiler/testData/parseCodeFragment/block/severalStatements.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')

compiler/testData/parseCodeFragment/block/unexpectedSymbol.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')

compiler/testData/parseCodeFragment/expression/error.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BINARY_EXPRESSION
     INTEGER_CONSTANT
       PsiElement(INTEGER_LITERAL)('1')

compiler/testData/parseCodeFragment/expression/simple.txt

@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BINARY_EXPRESSION
     INTEGER_CONSTANT
       PsiElement(INTEGER_LITERAL)('1')

compiler/testData/psi/AbsentInnerType.txt

@@ -1,4 +1,4 @@
-JetFile: AbsentInnerType.kt
+KtFile: AbsentInnerType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/AnonymousInitializer.txt

@@ -1,4 +1,4 @@
-JetFile: AnonymousInitializer.kt
+KtFile: AnonymousInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/AssertNotNull.txt

@@ -1,4 +1,4 @@
-JetFile: AssertNotNull.kt
+KtFile: AssertNotNull.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/BabySteps.txt

@@ -1,4 +1,4 @@
-JetFile: BabySteps.kt
+KtFile: BabySteps.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')

compiler/testData/psi/BabySteps_ERR.txt

@@ -1,4 +1,4 @@
-JetFile: BabySteps_ERR.kt
+KtFile: BabySteps_ERR.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')

compiler/testData/psi/BackslashInString.txt

@@ -1,4 +1,4 @@
-JetFile: BackslashInString.kt
+KtFile: BackslashInString.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt

@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile1.kt
+KtFile: BlockCommentAtBeginningOfFile1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt

@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile2.kt
+KtFile: BlockCommentAtBeginningOfFile2.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt

@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile3.kt
+KtFile: BlockCommentAtBeginningOfFile3.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt

@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile4.kt
+KtFile: BlockCommentAtBeginningOfFile4.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/BlockCommentUnmatchedClosing_ERR.txt

@@ -1,4 +1,4 @@
-JetFile: BlockCommentUnmatchedClosing_ERR.kt
+KtFile: BlockCommentUnmatchedClosing_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/ByClauses.txt

@@ -1,4 +1,4 @@
-JetFile: ByClauses.kt
+KtFile: ByClauses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/CallWithManyClosures.txt

@@ -1,4 +1,4 @@
-JetFile: CallWithManyClosures.kt
+KtFile: CallWithManyClosures.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/CallsInWhen.txt

@@ -1,4 +1,4 @@
-JetFile: CallsInWhen.kt
+KtFile: CallsInWhen.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/CollectionLiterals.txt

@@ -1,4 +1,4 @@
-JetFile: CollectionLiterals.kt
+KtFile: CollectionLiterals.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/CollectionLiterals_ERR.txt

@@ -1,4 +1,4 @@
-JetFile: CollectionLiterals_ERR.kt
+KtFile: CollectionLiterals_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/CommentsBinding.txt

@@ -1,4 +1,4 @@
-JetFile: CommentsBinding.kt
+KtFile: CommentsBinding.kt
   PsiComment(BLOCK_COMMENT)('/*\n * Copyright JetBrains s.r.o.\n */')
   PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE

compiler/testData/psi/CommentsBindingInLambda.txt

@@ -1,4 +1,4 @@
-JetFile: CommentsBindingInLambda.kt
+KtFile: CommentsBindingInLambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/CommentsBindingInStatementBlock.txt

@@ -1,4 +1,4 @@
-JetFile: CommentsBindingInStatementBlock.kt
+KtFile: CommentsBindingInStatementBlock.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/Constructors.txt

@@ -1,4 +1,4 @@
-JetFile: Constructors.kt
+KtFile: Constructors.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/ControlStructures.txt

@@ -1,4 +1,4 @@
-JetFile: ControlStructures.kt
+KtFile: ControlStructures.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DefaultKeyword.txt

@@ -1,4 +1,4 @@
-JetFile: DefaultKeyword.kt
+KtFile: DefaultKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DocCommentAfterFileAnnotations.txt

@@ -1,4 +1,4 @@
-JetFile: DocCommentAfterFileAnnotations.kt
+KtFile: DocCommentAfterFileAnnotations.kt
   FILE_ANNOTATION_LIST
     ANNOTATION
       PsiElement(AT)('@')

compiler/testData/psi/DocCommentForFirstDeclaration.txt

@@ -1,4 +1,4 @@
-JetFile: DocCommentForFirstDeclaration.kt
+KtFile: DocCommentForFirstDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt

@@ -1,4 +1,4 @@
-JetFile: DocCommentOnPackageDirectiveLine.kt
+KtFile: DocCommentOnPackageDirectiveLine.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')

compiler/testData/psi/DocCommentsBinding.txt

@@ -1,4 +1,4 @@
-JetFile: DocCommentsBinding.kt
+KtFile: DocCommentsBinding.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DoubleColon.txt

@@ -1,4 +1,4 @@
-JetFile: DoubleColon.kt
+KtFile: DoubleColon.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DoubleColonWhitespaces.txt

@@ -1,4 +1,4 @@
-JetFile: DoubleColonWhitespaces.kt
+KtFile: DoubleColonWhitespaces.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DoubleColon_ERR.txt

@@ -1,4 +1,4 @@
-JetFile: DoubleColon_ERR.kt
+KtFile: DoubleColon_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DuplicateAccessor.txt

@@ -1,4 +1,4 @@
-JetFile: DuplicateAccessor.kt
+KtFile: DuplicateAccessor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DynamicReceiver.txt

@@ -1,4 +1,4 @@
-JetFile: DynamicReceiver.kt
+KtFile: DynamicReceiver.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DynamicSoftKeyword.txt

@@ -1,4 +1,4 @@
-JetFile: DynamicSoftKeyword.kt
+KtFile: DynamicSoftKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/DynamicTypes.txt

@@ -1,4 +1,4 @@
-JetFile: DynamicTypes.kt
+KtFile: DynamicTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EOLsInComments.txt

@@ -1,4 +1,4 @@
-JetFile: EOLsInComments.kt
+KtFile: EOLsInComments.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EOLsOnRollback.txt

@@ -1,4 +1,4 @@
-JetFile: EOLsOnRollback.kt
+KtFile: EOLsOnRollback.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EmptyFile.txt

@@ -1,4 +1,4 @@
-JetFile: EmptyFile.kt
+KtFile: EmptyFile.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EmptyName.txt

@@ -1,4 +1,4 @@
-JetFile: EmptyName.kt
+KtFile: EmptyName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumCommas.txt

@@ -1,4 +1,4 @@
-JetFile: EnumCommas.kt
+KtFile: EnumCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaAnnotatedMember.kt
+KtFile: EnumEntryCommaAnnotatedMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntryCommaInlineMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaInlineMember.kt
+KtFile: EnumEntryCommaInlineMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntryCommaMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaMember.kt
+KtFile: EnumEntryCommaMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntryCommaPublicMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaPublicMember.kt
+KtFile: EnumEntryCommaPublicMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntrySemicolonInlineMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntrySemicolonInlineMember.kt
+KtFile: EnumEntrySemicolonInlineMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntrySemicolonMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntrySemicolonMember.kt
+KtFile: EnumEntrySemicolonMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntrySpaceInlineMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntrySpaceInlineMember.kt
+KtFile: EnumEntrySpaceInlineMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntrySpaceMember.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntrySpaceMember.kt
+KtFile: EnumEntrySpaceMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumEntryTwoCommas.txt

@@ -1,4 +1,4 @@
-JetFile: EnumEntryTwoCommas.kt
+KtFile: EnumEntryTwoCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumIn.txt

@@ -1,4 +1,4 @@
-JetFile: EnumIn.kt
+KtFile: EnumIn.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumInline.txt

@@ -1,4 +1,4 @@
-JetFile: EnumInline.kt
+KtFile: EnumInline.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST

compiler/testData/psi/EnumInlinePublic.txt

@@ -1,4 +1,4 @@
-JetFile: EnumInlinePublic.kt
+KtFile: EnumInlinePublic.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST