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

Cleanup 193 compatibility fixes

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2020-11-06 02:53:05 +03:00
parent 8620d26a8a
commit 3feff16a77
118 changed files with 305 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/build.gradle.kts
+4 -15
View File
@@ -22,9 +22,6 @@ dependencies {
testRuntimeOnly(project(":nj2k:nj2k-services"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":idea:kotlin-gradle-tooling"))
Platform[193].orLower {
testRuntimeOnly(project(":idea:idea-gradle-tooling-api"))
}
testRuntimeOnly(project(":kotlin-gradle-statistics"))
testImplementation(intellijPluginDep("gradle"))
@@ -40,22 +37,14 @@ dependencies {
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.+")
testImplementation("khttp:khttp:1.0.0")
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
Platform[193].orHigher {
testImplementation(intellijPluginDep("gradle-java"))
testRuntimeOnly(intellijPluginDep("gradle-java"))
}
testImplementation(intellijPluginDep("gradle-java"))
testRuntimeOnly(intellijPluginDep("gradle-java"))
testCompileOnly(intellijDep())
testCompileOnly(project(":nj2k"))
Platform[193].orLower {
testCompileOnly(project(":idea:idea-gradle-tooling-api"))
}
testCompileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }
}
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
-1
View File
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.initDefaultPro
import org.jetbrains.kotlin.idea.perf.util.logMessage
import org.jetbrains.kotlin.idea.test.invalidateLibraryCache
import org.jetbrains.kotlin.idea.testFramework.*
import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.cleanupCaches
import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.close
import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.isAKotlinScriptFile
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt
+1 -1
View File
@@ -26,10 +26,10 @@ import com.intellij.psi.PsiElementVisitor
import com.intellij.psi.impl.search.IndexPatternBuilder
import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
import com.intellij.psi.xml.XmlFileNSInfoProvider
import com.intellij.testFramework.TestApplicationManager
import com.intellij.xml.XmlSchemaProvider
import org.jetbrains.kotlin.idea.framework.KotlinSdkType
import org.jetbrains.kotlin.idea.perf.util.TeamCity
import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
import java.io.File
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
-1
View File
@@ -43,7 +43,6 @@ import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.initDefaultPro
import org.jetbrains.kotlin.idea.test.GradleProcessOutputInterceptor
import org.jetbrains.kotlin.idea.test.invalidateLibraryCache
import org.jetbrains.kotlin.idea.testFramework.*
import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
import java.io.File
idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt
-18
View File
@@ -1,18 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.testFramework
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ex.ProjectManagerEx
// FIX ME WHEN BUNCH 193 REMOVED
fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean {
if (!dispose) error("dispose should be true")
return this.forceCloseProject(project)
}
// FIX ME WHEN BUNCH 193 REMOVED
typealias TestApplicationManager = com.intellij.testFramework.TestApplicationManager
idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt
+2 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.startup.StartupManager
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.impl.PsiDocumentManagerBase
import com.intellij.testFramework.ExtensionTestUtil
import com.intellij.testFramework.TestApplicationManager
import com.intellij.testFramework.runInEdtAndWait
import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.idea.perf.util.logMessage
@@ -84,8 +85,7 @@ fun TestApplicationManager.closeProject(project: Project) {
logMessage { "project '$name' is about to be closed" }
dispatchAllInvocationEvents()
val projectManagerEx = ProjectManagerEx.getInstanceEx()
projectManagerEx.forceCloseProjectEx(project, true)
projectManagerEx.forceCloseProject(project)
logMessage { "project '$name' successfully closed" }
}
idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202
+2 -2
View File
@@ -25,6 +25,7 @@ import com.intellij.platform.PlatformProjectOpenProcessor
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.impl.PsiDocumentManagerBase
import com.intellij.testFramework.ExtensionTestUtil
import com.intellij.testFramework.TestApplicationManager
import com.intellij.testFramework.runInEdtAndWait
import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.idea.perf.util.logMessage
@@ -85,8 +86,7 @@ fun TestApplicationManager.closeProject(project: Project) {
logMessage { "project '$name' is about to be closed" }
dispatchAllInvocationEvents()
val projectManagerEx = ProjectManagerEx.getInstanceEx()
projectManagerEx.forceCloseProjectEx(project, true)
projectManagerEx.forceCloseProject(project)
logMessage { "project '$name' successfully closed" }
}