From 785688b1ca594bad371117a0197506c8687b064f Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Thu, 5 Sep 2024 16:42:16 +0300 Subject: [PATCH] Fix compatibility in tests with 2024.2 --- .../ideavim/option/EffectiveOptionChangeListenerTest.kt | 5 +++-- .../plugins/ideavim/option/OptionDeclaredScopeTest.kt | 5 +++-- .../ideavim/option/overrides/TextWidthOptionMapperTest.kt | 4 ++-- .../plugins/ideavim/option/overrides/WrapOptionMapperTest.kt | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt index f950871041..b9a76ba393 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt @@ -8,11 +8,13 @@ package org.jetbrains.plugins.ideavim.option +import com.intellij.openapi.components.ComponentManagerEx import com.intellij.openapi.editor.Editor import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.TextEditor import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl +import com.intellij.platform.util.coroutines.childScope import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory import com.intellij.testFramework.replaceService @@ -61,8 +63,7 @@ class EffectiveOptionChangeListenerTest : VimTestCase() { super.setUp(testInfo) // Copied from FileEditorManagerTestCase to allow us to split windows - @Suppress("DEPRECATION") - manager = FileEditorManagerImpl(fixture.project, fixture.project.coroutineScope) + manager = FileEditorManagerImpl(fixture.project, (fixture.project as ComponentManagerEx).getCoroutineScope().childScope()) fixture.project.replaceService(FileEditorManager::class.java, manager, fixture.testRootDisposable) // Create a new editor that will represent a new buffer in a separate window. It will have default values diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt index 2ff1b527b6..00bac878a7 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt @@ -8,11 +8,13 @@ package org.jetbrains.plugins.ideavim.option +import com.intellij.openapi.components.ComponentManagerEx import com.intellij.openapi.editor.Editor import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.TextEditor import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl +import com.intellij.platform.util.coroutines.childScope import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory import com.intellij.testFramework.replaceService @@ -51,8 +53,7 @@ class OptionDeclaredScopeTest : VimTestCase() { super.setUp(testInfo) // Copied from FileEditorManagerTestCase to allow us to split windows - @Suppress("DEPRECATION") - manager = FileEditorManagerImpl(fixture.project, fixture.project.coroutineScope) + manager = FileEditorManagerImpl(fixture.project, (fixture.project as ComponentManagerEx).getCoroutineScope().childScope()) fixture.project.replaceService(FileEditorManager::class.java, manager, fixture.testRootDisposable) // Create a new editor that will represent a new buffer in a separate window. It will have default values diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt index 21968a4ff5..b366ed5701 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt @@ -10,6 +10,7 @@ package org.jetbrains.plugins.ideavim.option.overrides import com.intellij.application.options.CodeStyle import com.intellij.lang.Language +import com.intellij.openapi.components.ComponentManagerEx import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.impl.SettingsImpl import com.intellij.openapi.fileEditor.FileEditorManager @@ -45,8 +46,7 @@ class TextWidthOptionMapperTest : VimTestCase() { super.setUp(testInfo) // Copied from FileEditorManagerTestCase to allow us to split windows - @Suppress("DEPRECATION") - val manager = FileEditorManagerImpl(fixture.project, fixture.project.coroutineScope.childScope()) + val manager = FileEditorManagerImpl(fixture.project, (fixture.project as ComponentManagerEx).getCoroutineScope().childScope()) fixture.project.replaceService(FileEditorManager::class.java, manager, fixture.testRootDisposable) configureByText("\n") diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/WrapOptionMapperTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/WrapOptionMapperTest.kt index b773a438ea..7662aed268 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/WrapOptionMapperTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/WrapOptionMapperTest.kt @@ -8,6 +8,7 @@ package org.jetbrains.plugins.ideavim.option.overrides +import com.intellij.openapi.components.ComponentManagerEx import com.intellij.openapi.editor.ex.EditorSettingsExternalizable import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl @@ -34,8 +35,7 @@ class WrapOptionMapperTest : VimTestCase() { super.setUp(testInfo) // Copied from FileEditorManagerTestCase to allow us to split windows - @Suppress("DEPRECATION") - manager = FileEditorManagerImpl(fixture.project, fixture.project.coroutineScope.childScope()) + manager = FileEditorManagerImpl(fixture.project, (fixture.project as ComponentManagerEx).getCoroutineScope().childScope()) fixture.project.replaceService(FileEditorManager::class.java, manager, fixture.testRootDisposable) configureByText("\n")