Disable platform-specific checkers in common

JetBrains · Nov 25, 2019 · a5b1775 · a5b1775
1 parent 42ac850
commit a5b1775
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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<*><!>>
+class B<T : Array<*>>
diff --git 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<*><!>>
+class B<T : Array<*>>