From a9c0b4f8d3f67535629805a477bfed412e14e0e3 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Fri, 14 Jul 2017 20:37:20 +0300
Subject: [PATCH] Report full package FQ name in compilation errors related to
 visibility

 #KT-18966 Fixed

GitOrigin-RevId: b56ffae526ead0b04d3763cdf4c714a7e0b0bf92
---
 .../jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java  | 6 ++++++
 .../diagnosticsMessage/fullPackageFQNameOnVisiblityError.kt | 6 ++++++
 .../multiModuleHighlighting/testRoot/m2Test/m2Test.kt       | 2 +-
 .../multiModuleHighlighting/testRoot/m3Test/m3Test.kt       | 4 ++--
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/fullPackageFQNameOnVisiblityError.kt

diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
index cb7354844415..9e1920fc264f 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
@@ -986,6 +986,12 @@ public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/diagnosticsMessage"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("fullPackageFQNameOnVisiblityError.kt")
+        public void testFullPackageFQNameOnVisiblityError() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/diagnosticsMessage/fullPackageFQNameOnVisiblityError.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("incompleteTypeArgumentList.kt")
         public void testIncompleteTypeArgumentList() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/diagnosticsMessage/incompleteTypeArgumentList.kt");
diff --git a/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/fullPackageFQNameOnVisiblityError.kt b/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/fullPackageFQNameOnVisiblityError.kt
new file mode 100644
index 000000000000..df9ae566fd94
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/fullPackageFQNameOnVisiblityError.kt
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+
+package a.b
+
+@<error descr="[INVISIBLE_MEMBER] Cannot access 'InlineOnly': it is internal in 'kotlin.internal'">kotlin.internal.<error descr="[INVISIBLE_REFERENCE] Cannot access 'InlineOnly': it is internal in 'kotlin.internal'">InlineOnly</error></error>
+inline fun foo() {}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
index 3e92a829a4e7..0e3b6fd516a0 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
@@ -15,7 +15,7 @@ fun access() {
     publicInM1()
 
     <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 'shared.test'">internalInM1Test</error>()
     publicInM1Test()
 
     <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is private in file">privateInM2</error>()
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
index 2465887c0822..23f6c40a81fe 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
@@ -15,7 +15,7 @@ fun access() {
     publicInM1()
 
     <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 'shared.test'">internalInM1Test</error>()
     publicInM1Test()
 
     <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is private in file">privateInM2</error>()
@@ -23,7 +23,7 @@ fun access() {
     publicInM2()
 
     <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 'shared.test'">internalInM2Test</error>()
     publicInM2Test()
 
     <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is private in file">privateInM3</error>()