Compilation fixes for as23
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
index 3b1966e..9ab18cd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
@@ -44,13 +44,14 @@
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.utils.keysToMap
-import org.jetbrains.plugins.groovy.lang.psi.impl.stringValue
import org.junit.Assert
import java.io.File
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
import kotlin.test.assertTrue
+fun PsiAnnotationMemberValue?.stringValue() = (this as? PsiLiteral)?.value as? String
+
abstract class AbstractIdeLightClassTest : KotlinLightCodeInsightFixtureTestCase() {
fun doTest(testDataPath: String) {
val extraFilePath = testDataPath.replace(".kt", ".extra.kt")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt
index e577fc2..5174f72 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt
@@ -20,9 +20,11 @@
import com.intellij.codeInspection.ProblemDescriptorBase
import com.intellij.openapi.util.Ref
import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection
import org.jetbrains.kotlin.idea.inspections.gradle.DifferentStdlibGradleVersionInspection
import org.jetbrains.kotlin.idea.inspections.runInspection
+import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
import org.junit.Assert
import org.junit.Test
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionUtils.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionUtils.kt
index 149cc28..b132da8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionUtils.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionUtils.kt
@@ -17,16 +17,17 @@
package org.jetbrains.kotlin.idea.inspections
import com.intellij.analysis.AnalysisScope
+import com.intellij.codeInspection.InspectionManager
import com.intellij.codeInspection.LocalInspectionTool
+import com.intellij.codeInspection.ex.InspectionManagerEx
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper
import com.intellij.codeInspection.ui.InspectionToolPresentation
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.testFramework.InspectionTestUtil
-import com.intellij.testFramework.createGlobalContextForTool
+import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl.createGlobalContextForTool
import com.intellij.util.xml.highlighting.DomElementsInspection
import org.jetbrains.kotlin.idea.inspections.gradle.DifferentKotlinGradleVersionInspection
-import org.jetbrains.kotlin.idea.maven.inspections.DifferentKotlinMavenVersionInspection
import org.jetbrains.plugins.gradle.codeInspection.GradleBaseInspection
fun runInspection(
@@ -37,14 +38,13 @@
val tool = wrapper.tool
if (tool is DomElementsInspection<*> || tool is GradleBaseInspection) {
when (tool) {
- is DifferentKotlinMavenVersionInspection -> tool.testVersionMessage = "\$PLUGIN_VERSION"
is DifferentKotlinGradleVersionInspection -> tool.testVersionMessage = "\$PLUGIN_VERSION"
}
}
val scope = if (files != null) AnalysisScope(project, files) else AnalysisScope(project)
scope.invalidate()
- val globalContext = createGlobalContextForTool(scope, project, listOf(wrapper))
+ val globalContext = createGlobalContextForTool(scope, project, InspectionManager.getInstance(project) as InspectionManagerEx, wrapper)
InspectionTestUtil.runTool(wrapper, scope, globalContext)
if (withTestDir != null) {
InspectionTestUtil.compareToolResults(globalContext, wrapper, false, withTestDir)
diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
index 2dc32b7..70c567b 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
@@ -48,8 +48,8 @@
// Android Extensions should be always enabled for Android/JPS
if (isLegacyIdeaAndroidModule(module)) return true
- val androidGradleFacet = AndroidGradleFacet.getInstance(module) ?: return false
- val buildFile = androidGradleFacet.gradleModel?.buildFile ?: return false
+ val androidGradleFacet = GradleFacet.getInstance(module) ?: return false
+ val buildFile = androidGradleFacet.gradleModuleModel?.buildFile ?: return false
val buildGroovyFile = psiManager.findFile(buildFile) as? GroovyFile ?: return false
return GradleBuildFile.getPlugins(buildGroovyFile).contains("kotlin-android-extensions")
}
