Remove quotes around visibility in invisible member diagnostic

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java

@@ -94,8 +94,8 @@ public class DefaultErrorMessages {
     static {
         MAP.put(UNRESOLVED_REFERENCE, "Unresolved reference: {0}", ELEMENT_TEXT);
 
-        MAP.put(INVISIBLE_REFERENCE, "Cannot access ''{0}'': it is ''{1}'' in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
+        MAP.put(INVISIBLE_REFERENCE, "Cannot access ''{0}'': it is {1} in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
-        MAP.put(INVISIBLE_MEMBER, "Cannot access ''{0}'': it is ''{1}'' in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
+        MAP.put(INVISIBLE_MEMBER, "Cannot access ''{0}'': it is {1} in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
 
         MAP.put(PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL, "Protected constructor ''{0}'' from other classes can only be used in super-call", Renderers.SHORT_NAMES_IN_TYPES);
 

idea/testData/copyPaste/imports/NoImportForBuiltIns.expected.kt

@@ -1,7 +1,7 @@
-// ERROR: Cannot access 'd': it is 'private' in file
+// ERROR: Cannot access 'd': it is private in file
-// ERROR: Cannot access 'd': it is 'private' in file
+// ERROR: Cannot access 'd': it is private in file
-// ERROR: Cannot access 'b': it is 'private' in file
+// ERROR: Cannot access 'b': it is private in file
-// ERROR: Cannot access 'b': it is 'private' in file
+// ERROR: Cannot access 'b': it is private in file
 package to
 
 import a.b

idea/testData/diagnosticMessage/invisibleMember.kt

@@ -11,8 +11,8 @@ class A {
 }
 
 fun foo() {
-    A.B()     // ERROR 1: Cannot access 'B': it is 'private' in 'A'
+    A.B()     // ERROR 1: Cannot access 'B': it is private in 'A'
-    A.C()     // ERROR 2: Cannot access '' : it is 'private' in 'C'
+    A.C()     // ERROR 2: Cannot access '' : it is private in 'C'
 
-    A().bar() // ERROR 3: Cannot access 'bar' : it is 'private' in 'A'
+    A().bar() // ERROR 3: Cannot access 'bar' : it is private in 'A'
 }

idea/testData/diagnosticMessage/invisibleMember1.txt

@@ -1,2 +1,2 @@
 <!-- invisibleMember1 -->
-Cannot access 'B': it is 'private' in 'A'
+Cannot access 'B': it is private in 'A'

idea/testData/diagnosticMessage/invisibleMember2.txt

@@ -1,2 +1,2 @@
 <!-- invisibleMember2 -->
-Cannot access '<init>': it is 'private' in 'C'
+Cannot access '<init>': it is private in 'C'

idea/testData/diagnosticMessage/invisibleMember3.txt

@@ -1,2 +1,2 @@
 <!-- invisibleMember3 -->
-Cannot access 'bar': it is 'private' in 'A'
+Cannot access 'bar': it is private in 'A'

idea/testData/multiModuleHighlighting/testRoot/m1Test/m1Test.kt

@@ -10,7 +10,7 @@ public fun publicInM1Test() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
     internalInM1()
     publicInM1()
 

idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt

@@ -10,8 +10,8 @@ public fun publicInM2() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is internal in 'shared'">internalInM1</error>()
     publicInM1()
 
     <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: privateInM1Test">privateInM1Test</error>()

idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt

@@ -10,15 +10,15 @@ public fun publicInM2Test() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is internal in 'shared'">internalInM1</error>()
     publicInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in file">privateInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is private in file">privateInM1Test</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is 'internal' in 'test'">internalInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is internal in 'test'">internalInM1Test</error>()
     publicInM1Test()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in file">privateInM2</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is private in file">privateInM2</error>()
     internalInM2()
     publicInM2()
 

idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt

@@ -10,23 +10,23 @@ public fun publicInM3Test() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is internal in 'shared'">internalInM1</error>()
     publicInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in file">privateInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is private in file">privateInM1Test</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is 'internal' in 'test'">internalInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is internal in 'test'">internalInM1Test</error>()
     publicInM1Test()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in file">privateInM2</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is private in file">privateInM2</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2': it is 'internal' in 'shared'">internalInM2</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2': it is internal in 'shared'">internalInM2</error>()
     publicInM2()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2Test': it is 'private' in file">privateInM2Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2Test': it is private in file">privateInM2Test</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2Test': it is 'internal' in 'test'">internalInM2Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2Test': it is internal in 'test'">internalInM2Test</error>()
     publicInM2Test()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is 'private' in file">privateInM3</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is private in file">privateInM3</error>()
     internalInM3()
     publicInM3()
 

idea/testData/multiModuleHighlighting/visibility/m2/m2.kt

@@ -5,30 +5,30 @@ import m1.*
 fun testVisibility() {
     PublicClassInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'InternalClassInM1': it is 'internal' in 'm1'">InternalClassInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'InternalClassInM1': it is internal in 'm1'">InternalClassInM1</error>()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'PrivateClassInM1': it is 'private' in file">PrivateClassInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'PrivateClassInM1': it is private in file">PrivateClassInM1</error>()
 
     publicFunInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalFunInM1': it is 'internal' in 'm1'">internalFunInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalFunInM1': it is internal in 'm1'">internalFunInM1</error>()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateFunInM1': it is 'private' in file">privateFunInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateFunInM1': it is private in file">privateFunInM1</error>()
 }
 
 public class ClassInM2
 
-public class B: <error descr="[INVISIBLE_MEMBER] Cannot access '<init>': it is 'internal' in 'A'">A</error>() {
+public class B: <error descr="[INVISIBLE_MEMBER] Cannot access '<init>': it is internal in 'A'">A</error>() {
 
     fun accessA(<warning descr="[UNUSED_PARAMETER] Parameter 'a' is never used">a</warning>: A) {}
 
     fun f() {
-        <error descr="[INVISIBLE_MEMBER] Cannot access 'pri': it is 'invisible (private in a supertype)' in 'B'">pri</error>()
+        <error descr="[INVISIBLE_MEMBER] Cannot access 'pri': it is invisible (private in a supertype) in 'B'">pri</error>()
 
         pro()
 
         pub()
 
-        <error descr="[INVISIBLE_MEMBER] Cannot access 'int': it is 'invisible (private in a supertype)' in 'B'">int</error>()
+        <error descr="[INVISIBLE_MEMBER] Cannot access 'int': it is invisible (private in a supertype) in 'B'">int</error>()
     }
 }

idea/testData/quickfix/decreaseVisibility/exposedParameterType.kt

@@ -4,7 +4,7 @@
 // ACTION: Make 'Nested' public
 // ACTION: Remove parameter 'arg'
 // ERROR: 'internal' function exposes its 'private' parameter type argument Nested
-// ERROR: Cannot access 'Nested': it is 'private' in 'Outer'
+// ERROR: Cannot access 'Nested': it is private in 'Outer'
 
 class Outer {
     private class Nested

idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.after.kt

@@ -1,6 +1,6 @@
 // "Make 'foo' internal" "true"
 // ACTION: Make 'foo' public
-// ERROR: Cannot access 'foo': it is 'private' in 'First'
+// ERROR: Cannot access 'foo': it is private in 'First'
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.before.Main.kt

@@ -1,6 +1,6 @@
 // "Make 'foo' internal" "true"
 // ACTION: Make 'foo' public
-// ERROR: Cannot access 'foo': it is 'private' in 'First'
+// ERROR: Cannot access 'foo': it is private in 'First'
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateMemberToInternalWithExposed.kt

@@ -1,6 +1,6 @@
 // "Make bar internal" "false"
 // ACTION: Convert property initializer to getter
-// ERROR: Cannot access 'bar': it is 'private' in 'First'
+// ERROR: Cannot access 'bar': it is private in 'First'
 
 private data class Data(val x: Int)
 

idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.after.kt

@@ -1,6 +1,6 @@
 // "Make 'f' internal" "true"
 // ACTION: Make 'f' public
-// ERROR: Cannot access 'f': it is 'private' in file
+// ERROR: Cannot access 'f': it is private in file
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.before.Main.kt

@@ -1,6 +1,6 @@
 // "Make 'f' internal" "true"
 // ACTION: Make 'f' public
-// ERROR: Cannot access 'f': it is 'private' in file
+// ERROR: Cannot access 'f': it is private in file
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.after.kt

@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.before.Main.kt

@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.after.kt

@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 

idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.before.Main.kt

@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 

idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt

@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddModifierFix" "false"
 // ERROR: This type is final, so it cannot be inherited from
-// ERROR: Cannot access '<init>': it is 'private' in 'E'
+// ERROR: Cannot access '<init>': it is private in 'E'
 enum class E {}
 class A : E<caret>() {}

j2k/testData/fileOrElement/enum/constantsWithBody2.kt

@@ -1,4 +1,4 @@
-// ERROR: Cannot access 'p': it is 'invisible (private in a supertype)' in 'A'
+// ERROR: Cannot access 'p': it is invisible (private in a supertype) in 'A'
 enum class E private constructor(private val p: Int) {
     A(1) {
         override fun bar() {

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 5, column 13
-Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36
+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 '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 '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 '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
+Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25

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 '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 '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 'testFunA': it is internal in 'test' at line 5, column 5
-Cannot access 'testFunB': it is 'internal' in 'test' at line 5, column 5
+Cannot access 'testFunB': it is internal in 'test' at line 5, column 5

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 5, column 13
-Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36
+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 '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 '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
+Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25

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 =================

jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log

@@ -23,8 +23,8 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access '<init>': it is 'private' in 'A'
+Cannot access '<init>': it is private in 'A'
-Cannot access '<init>': it is 'private' in 'A'
+Cannot access '<init>': it is private in 'A'
 
 ================ Step #2 =================
 

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 =================

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 =================

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 =================
 

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 'FileAnnotation': it is internal in 'a'
-Cannot access 'A': it is 'internal' in 'a'
+Cannot access 'A': it is internal in 'a'
-Cannot access 'FileAnnotation': 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 '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'

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 'FileAnnotation': it is internal in 'a'
-Cannot access 'A': it is 'internal' in 'a'
+Cannot access 'A': it is internal in 'a'
-Cannot access 'FileAnnotation': 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 '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'

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 '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 'InternalClassAnnotation': it is 'internal' in 'a'
+Cannot access 'InternalClassAnnotation': it is internal in 'a'
 Unresolved reference: InternalA
 Unresolved reference: internalA

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 =================
 

libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/build.log

@@ -27,11 +27,11 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'FileAnnotation': it is 'internal' in 'a'
+Cannot access 'FileAnnotation': it is internal in 'a'
-Cannot access 'A': it is 'internal' in 'a'
+Cannot access 'A': it is internal in 'a'
-Cannot access 'FileAnnotation': 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 'ClassAnnotation': it is 'internal' in 'a'
+Cannot access 'ClassAnnotation': it is internal in 'a'
 Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal'
-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'

libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/expected.txt

@@ -6,11 +6,11 @@ module2/src/module2_b.kt
 End of files
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'FileAnnotation': it is 'internal' in 'a'
+Cannot access 'FileAnnotation': it is internal in 'a'
-Cannot access 'A': it is 'internal' in 'a'
+Cannot access 'A': it is internal in 'a'
-Cannot access 'FileAnnotation': 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 'ClassAnnotation': it is 'internal' in 'a'
+Cannot access 'ClassAnnotation': it is internal in 'a'
 Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal'
-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'