Minor: JetFile -> KtFile

2017-05-15 19:45:34 +03:00
parent d1c9d0328a
commit 0cd3e4f3a4
430 changed files with 431 additions and 431 deletions
@@ -213,7 +213,7 @@ public class CodegenBinding {

        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();
        }));

@@ -70,7 +70,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn

    @Override
    public String toString() {
-        return "JetFile: " + getName();
+        return "KtFile: " + getName();
    }

    @NotNull
@@ -81,7 +81,7 @@ public abstract class KtClassOrObjectInfo<E extends KtClassOrObject> implements
            KtFile jetFile = (KtFile) file;
            return jetFile.getPackageFqName();
        }
-        throw new IllegalArgumentException("Not in a JetFile: " + element);
+        throw new IllegalArgumentException("Not in a KtFile: " + element);
    }

    @NotNull
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PROPERTY
      PsiElement(val)('val')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PsiErrorElement:Package directive and imports are forbidden in code fragments
      PACKAGE_DIRECTIVE
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    FUN
      PsiElement(fun)('fun')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PROPERTY
      PsiElement(val)('val')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PROPERTY
      PsiElement(val)('val')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PsiErrorElement:Package directive and imports are forbidden in code fragments
      PACKAGE_DIRECTIVE
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PsiErrorElement:Package directive and imports are forbidden in code fragments
      PACKAGE_DIRECTIVE
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    BINARY_EXPRESSION
      INTEGER_CONSTANT
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PROPERTY
      PsiElement(val)('val')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BLOCK
    PROPERTY
      PsiElement(val)('val')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BINARY_EXPRESSION
    INTEGER_CONSTANT
      PsiElement(INTEGER_LITERAL)('1')
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
  BINARY_EXPRESSION
    INTEGER_CONSTANT
      PsiElement(INTEGER_LITERAL)('1')
@@ -1,4 +1,4 @@
-JetFile: AbsentInnerType.kt
+KtFile: AbsentInnerType.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: AnonymousInitializer.kt
+KtFile: AnonymousInitializer.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: AssertNotNull.kt
+KtFile: AssertNotNull.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: BabySteps.kt
+KtFile: BabySteps.kt
  PACKAGE_DIRECTIVE
    PsiElement(package)('package')
    PsiWhiteSpace(' ')
@@ -1,4 +1,4 @@
-JetFile: BabySteps_ERR.kt
+KtFile: BabySteps_ERR.kt
  PACKAGE_DIRECTIVE
    PsiElement(package)('package')
    PsiWhiteSpace(' ')
@@ -1,4 +1,4 @@
-JetFile: BackslashInString.kt
+KtFile: BackslashInString.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile1.kt
+KtFile: BlockCommentAtBeginningOfFile1.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile2.kt
+KtFile: BlockCommentAtBeginningOfFile2.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile3.kt
+KtFile: BlockCommentAtBeginningOfFile3.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile4.kt
+KtFile: BlockCommentAtBeginningOfFile4.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: BlockCommentUnmatchedClosing_ERR.kt
+KtFile: BlockCommentUnmatchedClosing_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: ByClauses.kt
+KtFile: ByClauses.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: CallWithManyClosures.kt
+KtFile: CallWithManyClosures.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: CallsInWhen.kt
+KtFile: CallsInWhen.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: CollectionLiterals.kt
+KtFile: CollectionLiterals.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: CollectionLiterals_ERR.kt
+KtFile: CollectionLiterals_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: CommentsBinding.kt
+KtFile: CommentsBinding.kt
  PsiComment(BLOCK_COMMENT)('/*\n * Copyright JetBrains s.r.o.\n */')
  PsiWhiteSpace('\n')
  PACKAGE_DIRECTIVE
@@ -1,4 +1,4 @@
-JetFile: CommentsBindingInLambda.kt
+KtFile: CommentsBindingInLambda.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: CommentsBindingInStatementBlock.kt
+KtFile: CommentsBindingInStatementBlock.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Constructors.kt
+KtFile: Constructors.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: ControlStructures.kt
+KtFile: ControlStructures.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DefaultKeyword.kt
+KtFile: DefaultKeyword.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DocCommentAfterFileAnnotations.kt
+KtFile: DocCommentAfterFileAnnotations.kt
  FILE_ANNOTATION_LIST
    ANNOTATION
      PsiElement(AT)('@')
@@ -1,4 +1,4 @@
-JetFile: DocCommentForFirstDeclaration.kt
+KtFile: DocCommentForFirstDeclaration.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DocCommentOnPackageDirectiveLine.kt
+KtFile: DocCommentOnPackageDirectiveLine.kt
  PACKAGE_DIRECTIVE
    PsiElement(package)('package')
    PsiWhiteSpace(' ')
@@ -1,4 +1,4 @@
-JetFile: DocCommentsBinding.kt
+KtFile: DocCommentsBinding.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DoubleColon.kt
+KtFile: DoubleColon.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DoubleColonWhitespaces.kt
+KtFile: DoubleColonWhitespaces.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DoubleColon_ERR.kt
+KtFile: DoubleColon_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DuplicateAccessor.kt
+KtFile: DuplicateAccessor.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DynamicReceiver.kt
+KtFile: DynamicReceiver.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DynamicSoftKeyword.kt
+KtFile: DynamicSoftKeyword.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: DynamicTypes.kt
+KtFile: DynamicTypes.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EOLsInComments.kt
+KtFile: EOLsInComments.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EOLsOnRollback.kt
+KtFile: EOLsOnRollback.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EmptyFile.kt
+KtFile: EmptyFile.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EmptyName.kt
+KtFile: EmptyName.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumCommas.kt
+KtFile: EnumCommas.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaAnnotatedMember.kt
+KtFile: EnumEntryCommaAnnotatedMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaInlineMember.kt
+KtFile: EnumEntryCommaInlineMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaMember.kt
+KtFile: EnumEntryCommaMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaPublicMember.kt
+KtFile: EnumEntryCommaPublicMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySemicolonInlineMember.kt
+KtFile: EnumEntrySemicolonInlineMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySemicolonMember.kt
+KtFile: EnumEntrySemicolonMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySpaceInlineMember.kt
+KtFile: EnumEntrySpaceInlineMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySpaceMember.kt
+KtFile: EnumEntrySpaceMember.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumEntryTwoCommas.kt
+KtFile: EnumEntryTwoCommas.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumIn.kt
+KtFile: EnumIn.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumInline.kt
+KtFile: EnumInline.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumInlinePublic.kt
+KtFile: EnumInlinePublic.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumMissingName.kt
+KtFile: EnumMissingName.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumOldConstructorSyntax.kt
+KtFile: EnumOldConstructorSyntax.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumShortCommas.kt
+KtFile: EnumShortCommas.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumShortWithOverload.kt
+KtFile: EnumShortWithOverload.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: EnumWithAnnotationKeyword.kt
+KtFile: EnumWithAnnotationKeyword.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Enums.kt
+KtFile: Enums.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Expressions_ERR.kt
+KtFile: Expressions_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: ExtensionsWithQNReceiver.kt
+KtFile: ExtensionsWithQNReceiver.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FileStart_ERR.kt
+KtFile: FileStart_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FloatingPointLiteral.kt
+KtFile: FloatingPointLiteral.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: ForWithMultiDecl.kt
+KtFile: ForWithMultiDecl.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionCalls.kt
+KtFile: FunctionCalls.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionExpressions.kt
+KtFile: FunctionExpressions.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionExpressions_ERR.kt
+KtFile: FunctionExpressions_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionLiterals.kt
+KtFile: FunctionLiterals.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionLiterals_ERR.kt
+KtFile: FunctionLiterals_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionNoParameterList.kt
+KtFile: FunctionNoParameterList.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionTypes.kt
+KtFile: FunctionTypes.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionTypes_ERR.kt
+KtFile: FunctionTypes_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Functions.kt
+KtFile: Functions.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithoutName.kt
+KtFile: FunctionsWithoutName.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithoutName_ERR.kt
+KtFile: FunctionsWithoutName_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Functions_ERR.kt
+KtFile: Functions_ERR.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: HangOnLonelyModifier.kt
+KtFile: HangOnLonelyModifier.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: IfWithPropery.kt
+KtFile: IfWithPropery.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: ImportSoftKW.kt
+KtFile: ImportSoftKW.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Imports.kt
+KtFile: Imports.kt
  PACKAGE_DIRECTIVE
    PsiElement(package)('package')
    PsiWhiteSpace(' ')
@@ -1,4 +1,4 @@
-JetFile: Imports_ERR.kt
+KtFile: Imports_ERR.kt
  PACKAGE_DIRECTIVE
    PsiElement(package)('package')
    PsiWhiteSpace(' ')
@@ -1,4 +1,4 @@
-JetFile: IncompleteFunctionLiteral.kt
+KtFile: IncompleteFunctionLiteral.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Inner.kt
+KtFile: Inner.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: IntegerLiteral.kt
+KtFile: IntegerLiteral.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Interface.kt
+KtFile: Interface.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: InterfaceWithEnumKeyword.kt
+KtFile: InterfaceWithEnumKeyword.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: Labels.kt
+KtFile: Labels.kt
  PACKAGE_DIRECTIVE
    <empty list>
  IMPORT_LIST
@@ -1,4 +1,4 @@
-JetFile: LineCommentAfterFileAnnotations.kt
+KtFile: LineCommentAfterFileAnnotations.kt
  FILE_ANNOTATION_LIST
    ANNOTATION
      PsiElement(AT)('@')
--- a/Show More
+++ b/Show More