From 2cc4d878a8e1a37b0b8bbd93730466f02d661276 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 28 Jan 2020 21:55:23 +0300 Subject: [PATCH] 201: ProjectManagerEx.forceCloseProject(project, true) - no second parameter --- .../jetbrains/kotlin/idea/testFramework/compat.kt | 15 +++++++++++++++ .../kotlin/idea/testFramework/compat.kt.201 | 15 +++++++++++++++ .../kotlin/idea/testFramework/projectRoutines.kt | 4 ++-- .../idea/testFramework/projectRoutines.kt.191 | 2 +- .../idea/testFramework/projectRoutines.kt.192 | 2 +- 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt create mode 100644 idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt new file mode 100644 index 00000000000..042b4309d9d --- /dev/null +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt @@ -0,0 +1,15 @@ +/* + * 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 + +// BUNCH: 193 +fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean { + if (!dispose) error("dispose should be true") + return this.forceCloseProject(project, true) +} \ No newline at end of file diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 new file mode 100644 index 00000000000..eaa3f0c6af7 --- /dev/null +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 @@ -0,0 +1,15 @@ +/* + * 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 + +// BUNCH: 193 +fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean { + if (!dispose) error("dispose should be true") + return this.forceCloseProject(project) +} \ No newline at end of file diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt index 327af90be68..149a8c5f9f0 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt @@ -22,9 +22,9 @@ import com.intellij.testFramework.ExtensionTestUtil import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.idea.parameterInfo.HintType -import java.nio.file.Paths import java.io.PrintWriter import java.io.StringWriter +import java.nio.file.Paths fun commitAllDocuments() { val fileDocumentManager = FileDocumentManager.getInstance() @@ -72,7 +72,7 @@ fun loadProjectWithName(path: String, name: String): Project? = fun closeProject(project: Project) { dispatchAllInvocationEvents() val projectManagerEx = ProjectManagerEx.getInstanceEx() - projectManagerEx.forceCloseProject(project, true) + projectManagerEx.forceCloseProjectEx(project, true) } fun runStartupActivities(project: Project) { diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.191 b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.191 index a86d4c45cc6..48caaaca1ee 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.191 +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.191 @@ -76,7 +76,7 @@ fun loadProjectWithName(path: String, name: String): Project? = fun closeProject(project: Project) { dispatchAllInvocationEvents() val projectManagerEx = ProjectManagerEx.getInstanceEx() - projectManagerEx.forceCloseProject(project, true) + projectManagerEx.forceCloseProjectEx(project, true) } fun runStartupActivities(project: Project) { diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 index 22699ea3222..89586d6c8ee 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 @@ -71,7 +71,7 @@ fun loadProjectWithName(path: String, name: String): Project? = fun closeProject(project: Project) { dispatchAllInvocationEvents() val projectManagerEx = ProjectManagerEx.getInstanceEx() - projectManagerEx.forceCloseProject(project, true) + projectManagerEx.forceCloseProjectEx(project, true) } fun runStartupActivities(project: Project) {