diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index b97a187c913..109a31fe488 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -2,9 +2,9 @@ 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15 -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 '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 (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +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 '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 (private in a supertype) in 'ClassAA1' at line 27, column 25 diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt index f6a8fb3be27..24037a41f50 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt @@ -1,4 +1,4 @@ -Cannot access 'funA': it is 'internal' in 'test' at line 4, column 5 -Cannot access 'funB': it is 'internal' in 'test' at line 4, column 5 -Cannot access 'testFunA': it is 'internal' in 'test' at line 5, column 5 -Cannot access 'testFunB': it is 'internal' in 'test' at line 5, column 5 \ No newline at end of file +Cannot access 'funA': it is internal in 'test' at line 4, column 5 +Cannot access 'funB': it is internal in 'test' at line 4, column 5 +Cannot access 'testFunA': it is internal in 'test' at line 5, column 5 +Cannot access 'testFunB': it is internal in 'test' at line 5, column 5 \ 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 e1be8b69b99..a0692a54537 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,8 +1,8 @@ 'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 -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 (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +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 (private in a supertype) in 'ClassAA1' at line 27, column 25 diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index 51b1fa9217c..43fa0a23936 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -51,22 +51,22 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A 'public' generic exposes its 'private' parameter bound type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' parameter type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' return type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' return type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' return type A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log index d485c85a260..9c37cd50b36 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -23,8 +23,8 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access '': it is 'private' in 'A' -Cannot access '': it is 'private' in 'A' +Cannot access '': it is private in 'A' +Cannot access '': it is private in 'A' ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index edca3b9801d..ac9509d8ef2 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -32,13 +32,13 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A 'public' function exposes its 'private' return type A -Cannot access 'A': it is 'private' in file -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 (private in a supertype)' 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 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index c29b8374d1b..eadd060bf39 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -26,7 +26,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index e1585d4ab76..5422b612067 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -26,9 +26,9 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index 6a53134aea2..e8d2aee5cc8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -25,11 +25,11 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' 'public' function exposes its 'internal' parameter type A -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'a': it is 'internal' in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'a': it is internal in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log index 3c7f30277f0..21e1a572541 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -29,11 +29,11 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' 'public' function exposes its 'internal' parameter type A -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'a': it is 'internal' in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'a': it is internal in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index eae1394f4a3..5b42ada687d 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -26,9 +26,9 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' -Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' -Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' -Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' +Cannot access 'InternalFileAnnotation': it is internal in 'a' +Cannot access 'InternalFileAnnotation': it is internal in 'a' +Cannot access 'InternalClassAnnotation': it is internal in 'a' +Cannot access 'InternalClassAnnotation': it is internal in 'a' Unresolved reference: InternalA Unresolved reference: internalA diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log index ff9f8b0eba6..30638dfb226 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -10,7 +10,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'foo': it is 'private' in file +Cannot access 'foo': it is private in file ================ Step #2 =================