From a5b177543d615f3f03b72a2bb301677f95b3ce41 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Fri, 22 Nov 2019 14:09:25 +0300
Subject: [PATCH] Disable platform-specific checkers in common

---
 .../src/org/jetbrains/kotlin/idea/project/analyzerServices.kt | 4 ++--
 .../platformSpecficChecksInTwoTargets/common/common.kt        | 2 +-
 .../platformSpecificChecksInCommon/common/common.kt           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/analyzerServices.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/analyzerServices.kt
index 0c996d7ca7cc7..95a505862af6f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/analyzerServices.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/analyzerServices.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.idea.project
 
-import org.jetbrains.kotlin.caches.resolve.CompositeAnalyzerServices
+import org.jetbrains.kotlin.analyzer.common.CommonPlatformAnalyzerServices
 import org.jetbrains.kotlin.js.resolve.JsPlatformAnalyzerServices
 import org.jetbrains.kotlin.platform.SimplePlatform
 import org.jetbrains.kotlin.platform.TargetPlatform
@@ -21,7 +21,7 @@ import java.lang.IllegalStateException
 val TargetPlatform.findAnalyzerServices: PlatformDependentAnalyzerServices
     get() =
         when {
-            isCommon() -> CompositeAnalyzerServices(this.componentPlatforms.map { it.findAnalyzerServices })
+            isCommon() -> CommonPlatformAnalyzerServices
             else -> single().findAnalyzerServices
         }
 
diff --git a/idea/testData/multiplatform/platformSpecficChecksInTwoTargets/common/common.kt b/idea/testData/multiplatform/platformSpecficChecksInTwoTargets/common/common.kt
index 6c35c142222c0..497ea80778424 100644
--- a/idea/testData/multiplatform/platformSpecficChecksInTwoTargets/common/common.kt
+++ b/idea/testData/multiplatform/platformSpecficChecksInTwoTargets/common/common.kt
@@ -5,4 +5,4 @@ class A : (Int) -> Int
 fun `name in backticks`() {}
 
 // Array as upper bound isn't allowed on JVM
-class B<<!UPPER_BOUND_CANNOT_BE_ARRAY!>T : Array<*><!>>
\ No newline at end of file
+class B<T : Array<*>>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/platformSpecificChecksInCommon/common/common.kt b/idea/testData/multiplatform/platformSpecificChecksInCommon/common/common.kt
index 591ba308e21c6..34d2fc9939527 100644
--- a/idea/testData/multiplatform/platformSpecificChecksInCommon/common/common.kt
+++ b/idea/testData/multiplatform/platformSpecificChecksInCommon/common/common.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -ABSTRACT_MEMBER_NOT_IMPLEMENTED
 
 // Implementing kotlin functions isn't allowed on JS
-class <!IMPLEMENTING_FUNCTION_INTERFACE!>A<!> : (Int) -> Int
+class A : (Int) -> Int
 
 // Array as upper bound isn't allowed on JVM
-class B<<!UPPER_BOUND_CANNOT_BE_ARRAY!>T : Array<*><!>>
\ No newline at end of file
+class B<T : Array<*>>
\ No newline at end of file