From 759c325e8b0e4bb3aa7c0c0583784f01ee5a030b Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Fri, 28 Aug 2015 15:03:38 +0300
Subject: [PATCH] NoInternalVisibilityInStdLibTest: skip explicit internal
 modifiers

---
 .../src/test/kotlin/NoInternalVisibilityInStdLibTest.kt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt
index a00c1dc8af1..1c5e07cf713 100644
--- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt
+++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt
@@ -27,8 +27,10 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
 import org.jetbrains.kotlin.js.config.EcmaVersion
 import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
+import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.JetModifierListOwner
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -173,7 +175,10 @@ class NoInternalVisibilityInStdLibTest {
 
         if (descriptor is DeclarationDescriptorWithVisibility) {
             if (descriptor.visibility == Visibilities.INTERNAL) {
-                sink.reportInternalVisibility(descriptor)
+                val psi = DescriptorToSourceUtils.descriptorToDeclaration(descriptor)
+                if (psi !is JetModifierListOwner || psi.modifierList?.hasModifier(JetTokens.INTERNAL_KEYWORD) != true) {
+                    sink.reportInternalVisibility(descriptor)
+                }
             }
         }
         when (descriptor) {