From b3a54cff83e6a8e5b48aec38c965e266f8a2cd69 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 21 Jul 2016 15:59:23 +0300 Subject: [PATCH] Improve error message for inaccessible invisible_fake members #KT-8989 Fixed Original commit: b6b2303aa759ba62c8665a7231b7725ce990bf17 --- .../CircularDependenciesInternalFromAnotherModule/errors.txt | 2 +- .../testData/general/InternalFromAnotherModule/errors.txt | 2 +- .../flagsAndMemberInSameClassChanged/build.log | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index c025526d7a1..b97a187c913 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -7,4 +7,4 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'member': it is 'invisible (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index d1920809ebf..e1be8b69b99 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -5,4 +5,4 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'member': it is 'invisible (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index 5b6fbaf1784..edca3b9801d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -38,7 +38,7 @@ Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? -Cannot access 'x': it is 'invisible_fake' in 'B' +Cannot access 'x': it is 'invisible (private in a supertype)' in 'B' Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 =================