diff --git a/plugins/textmate/core/tests/BUILD.bazel b/plugins/textmate/core/tests/BUILD.bazel
index 60e9604b6060..c6155af57b63 100644
--- a/plugins/textmate/core/tests/BUILD.bazel
+++ b/plugins/textmate/core/tests/BUILD.bazel
@@ -20,6 +20,9 @@ jvm_library(
"//plugins/textmate/core",
"//platform/util/xmlDom",
"//platform/util",
+ "@lib//:kotlinx-coroutines-test",
+ "@lib//:kotlinx-coroutines-core",
+ "@lib//:kotlinx-collections-immutable",
]
)
### auto-generated section `build intellij.textmate.core.tests` end
diff --git a/plugins/textmate/core/tests/intellij.textmate.core.tests.iml b/plugins/textmate/core/tests/intellij.textmate.core.tests.iml
index 164d49d1451a..0a96f7295c6a 100644
--- a/plugins/textmate/core/tests/intellij.textmate.core.tests.iml
+++ b/plugins/textmate/core/tests/intellij.textmate.core.tests.iml
@@ -15,5 +15,8 @@
+
+
+
\ No newline at end of file
diff --git a/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt b/plugins/textmate/core/tests/src/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt
similarity index 97%
rename from plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt
rename to plugins/textmate/core/tests/src/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt
index e6124e86eeb4..7899b8708dfd 100644
--- a/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt
+++ b/plugins/textmate/core/tests/src/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt
@@ -4,11 +4,21 @@ import kotlinx.collections.immutable.PersistentList
import kotlinx.collections.immutable.PersistentSet
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.awaitCancellation
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
import kotlinx.coroutines.test.TestScope
import kotlinx.coroutines.test.advanceTimeBy
import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.test.testTimeSource
+import kotlinx.coroutines.withContext
import org.jetbrains.plugins.textmate.TestUtilMultiplatform
import org.jetbrains.plugins.textmate.update
import org.junit.jupiter.api.Test
@@ -16,8 +26,11 @@ import kotlin.concurrent.atomics.AtomicInt
import kotlin.concurrent.atomics.AtomicReference
import kotlin.concurrent.atomics.ExperimentalAtomicApi
import kotlin.concurrent.atomics.incrementAndFetch
-import kotlin.random.Random
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.milliseconds
@@ -210,7 +223,7 @@ class SLRUTextMateCacheTest {
capacity = 10,
computeFn = { key ->
TestUtilMultiplatform.threadSleep(10) // Simulate blocking computation time
- "computed-$key-${Random.nextInt()}"
+ "computed-$key-${kotlin.random.Random.nextInt()}"
},
disposeFn = { }
)
diff --git a/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt b/plugins/textmate/core/tests/src/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt
similarity index 100%
rename from plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt
rename to plugins/textmate/core/tests/src/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt