From 60603de0423c071b6983d713d31a5ab295d0ef5a Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 2 Aug 2023 15:57:54 +0200 Subject: [PATCH] LV20: fix JPS testdata where the error reporting slightly changed --- .../errors.txt | 6 +++--- .../errors.txt | 4 ++-- .../InternalFromAnotherModule/errors.txt | 18 +++++++++--------- .../jsKlib/classifierMembers/build.log | 8 ++++---- .../lookupTracker/jvm/SAM/build.log | 6 +++--- .../jvm/classifierMembers/build.log | 8 ++++---- .../lookupTracker/jvm/java/build.log | 4 ++-- .../jvm/syntheticProperties/build.log | 8 ++++---- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index 109a31fe488..65ce4b72d63 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -1,7 +1,7 @@ '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 -'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15 +Subclass 'public' exposes its 'internal' supertype 'InternalClass1'. at line 8, column 36 +Subclass 'public' exposes its 'internal' supertype 'InternalClass2'. at line 18, column 36 +Subclass 'public' 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 diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt index 24037a41f50..5db3fb3bc61 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 'fun funA(): Unit': it is internal in file. at line 4, column 5 +Cannot access 'fun funB(): Unit': it is internal in file. 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 618d9b8ae6c..767a098f0f5 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,10 +1,10 @@ -'internal open override val test/ClassBB1.member: kotlin/Int = Int(10) +'internal open override val test/ClassBB1.member: kotlin/Int internal get(): kotlin/Int' has no access to 'internal abstract val test/ClassB1.member: kotlin/Int - internal get(): kotlin/Int', so it cannot override it at line 14, column 14 -Cannot access '@Target(...) @Retention(...) annotation class InternalClassAnnotation : Annotation': it is internal in file at line 10, column 2 -Cannot access '@Target(...) @Retention(...) annotation class InternalTestAnnotation : Annotation': it is internal in file at line 1, column 7 -Cannot access 'class InternalClass1 : Any': it is internal in file at line 5, column 13 -Cannot access 'class InternalClass1 : Any': it is internal in file at line 8, column 36 -Cannot access 'val member: Int': it is internal in 'test/ClassA1' at line 27, column 25 -public subclass exposes its internal supertype 'InternalClass1' at line 8, column 36 -public subclass exposes its internal supertype 'InternalClass2' at line 18, column 36 \ No newline at end of file + internal get(): kotlin/Int', so it cannot override it. at line 14, column 14 +Cannot access '@Target(...) @Retention(...) annotation class InternalClassAnnotation : Annotation': it is internal in file. at line 10, column 2 +Cannot access '@Target(...) @Retention(...) annotation class InternalTestAnnotation : Annotation': it is internal in file. at line 1, column 7 +Cannot access 'class InternalClass1 : Any': it is internal in file. at line 5, column 13 +Cannot access 'class InternalClass1 : Any': it is internal in file. at line 8, column 36 +Cannot access 'val member: Int': it is internal in 'test/ClassA1'. at line 27, column 25 +Subclass 'public' exposes its 'internal' supertype 'InternalClass1'. at line 8, column 36 +Subclass 'public' exposes its 'internal' supertype 'InternalClass2'. at line 18, column 36 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log index 536cf259677..c910944c25d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log @@ -15,7 +15,7 @@ Exit code: OK Compiling files: src/usages.kt Exit code: COMPILATION_ERROR - Unresolved reference: vala - Unresolved reference: vara - Unresolved reference: foo - Unresolved reference: bar \ No newline at end of file + Unresolved reference 'vala'. + Unresolved reference 'vara'. + Unresolved reference 'foo'. + Unresolved reference 'bar'. \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log index 43e6a28a6c4..99297e92279 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log @@ -2,6 +2,6 @@ Compiling files: src/usages.kt Exit code: COMPILATION_ERROR - No value passed for parameter 'x' - No value passed for parameter 'x' - No value passed for parameter 'function' \ No newline at end of file + No value passed for parameter 'x'. + No value passed for parameter 'x'. + No value passed for parameter 'function'. \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log index 536cf259677..c910944c25d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log @@ -15,7 +15,7 @@ Exit code: OK Compiling files: src/usages.kt Exit code: COMPILATION_ERROR - Unresolved reference: vala - Unresolved reference: vara - Unresolved reference: foo - Unresolved reference: bar \ No newline at end of file + Unresolved reference 'vala'. + Unresolved reference 'vara'. + Unresolved reference 'foo'. + Unresolved reference 'bar'. \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log index cba253ede52..658cff6795c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log @@ -2,5 +2,5 @@ Compiling files: src/usages.kt Exit code: COMPILATION_ERROR - Unresolved reference: IS - Unresolved reference: C.IS \ No newline at end of file + Unresolved reference 'IS'. + Unresolved reference 'IS'. \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log index 627e4a4a15e..ebb2fd11200 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log @@ -3,11 +3,11 @@ Compiling files: src/KotlinClass.kt src/usages.kt Exit code: COMPILATION_ERROR - Unresolved reference: setFoo - Val cannot be reassigned + Unresolved reference 'setFoo'. + 'val' cannot be reassigned. Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int] Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int] - Unresolved reference: boo + Unresolved reference 'boo'. Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int] Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int] - Unresolved reference: boo \ No newline at end of file + Unresolved reference 'boo'. \ No newline at end of file