azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

193: Update to 193.3793.14-EAP-SNAPSHOT

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-09-30 15:50:39 +03:00
parent 7e9cfbc91a
commit f38123e78c
8 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle-native/build.gradle.kts
+9
View File
@@ -25,10 +25,16 @@ dependencies {
testCompile(projectTests(":idea:idea-gradle"))
compileOnly(intellijPluginDep("gradle"))
Platform[193].orHigher {
compileOnly(intellijPluginDep("gradle-java"))
}
compileOnly(intellijPluginDep("Groovy"))
compileOnly(intellijDep())
testCompile(intellijPluginDep("gradle"))
Platform[193].orHigher {
testCompile(intellijPluginDep("gradle-java"))
}
testCompileOnly(intellijPluginDep("Groovy"))
testCompileOnly(intellijDep())
@@ -55,6 +61,9 @@ dependencies {
testRuntime(intellijPluginDep("testng"))
testRuntime(intellijPluginDep("properties"))
testRuntime(intellijPluginDep("gradle"))
Platform[193].orHigher {
testRuntime(intellijPluginDep("gradle-java"))
}
testRuntime(intellijPluginDep("Groovy"))
testRuntime(intellijPluginDep("coverage"))
if (Ide.IJ()) {
idea/idea-gradle/build.gradle.kts
+9
View File
@@ -18,6 +18,9 @@ dependencies {
compileOnly(intellijDep())
compileOnly(intellijPluginDep("gradle"))
Platform[193].orHigher {
compileOnly(intellijPluginDep("gradle-java"))
}
compileOnly(intellijPluginDep("Groovy"))
compileOnly(intellijPluginDep("junit"))
compileOnly(intellijPluginDep("testng"))
@@ -32,6 +35,9 @@ dependencies {
testCompile(projectTests(":idea:idea-test-framework"))
testCompile(intellijPluginDep("gradle"))
Platform[193].orHigher {
testCompile(intellijPluginDep("gradle-java"))
}
testCompileOnly(intellijPluginDep("Groovy"))
testCompileOnly(intellijDep())
@@ -56,6 +62,9 @@ dependencies {
testRuntime(intellijPluginDep("testng"))
testRuntime(intellijPluginDep("properties"))
testRuntime(intellijPluginDep("gradle"))
Platform[193].orHigher {
testRuntime(intellijPluginDep("gradle-java"))
}
testRuntime(intellijPluginDep("Groovy"))
testRuntime(intellijPluginDep("coverage"))
if (Ide.IJ()) {
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
+2 -2
View File
@@ -65,8 +65,8 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
private fun enableInspectionTools(klass: Class<*>) {
val eps = ContainerUtil.newArrayList<InspectionEP>()
ContainerUtil.addAll<InspectionEP, LocalInspectionEP, List<InspectionEP>>(eps, *Extensions.getExtensions(LocalInspectionEP.LOCAL_INSPECTION))
ContainerUtil.addAll<InspectionEP, InspectionEP, List<InspectionEP>>(eps, *Extensions.getExtensions(InspectionEP.GLOBAL_INSPECTION))
ContainerUtil.addAll(eps, *Extensions.getExtensions(LocalInspectionEP.LOCAL_INSPECTION))
ContainerUtil.addAll(eps, *Extensions.getExtensions(InspectionEP.GLOBAL_INSPECTION))
val tool = eps.firstOrNull { it.implementationClass == klass.name }?.instantiateTool()
?: error("Could not find inspection tool for class: $klass")