From 77758d155250b27fb981d9bbf4c7bfef5332d04d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 29 Jun 2022 16:39:28 +0200 Subject: [PATCH] [Analysis] do not reregister services in AbstractStubBuilderTest --- .../stub/files/AbstractStubBuilderTest.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt index be486fc4980..882b00a3f01 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt @@ -11,6 +11,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.PsiElement import com.intellij.psi.impl.DebugUtil +import com.intellij.psi.stubs.PsiFileStub import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.analysis.decompiler.stub.file.CachedAttributeData import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache @@ -25,15 +26,17 @@ import java.io.DataOutput import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths +import java.util.stream.Collectors import kotlin.io.path.absolutePathString import kotlin.io.path.name import kotlin.io.path.readText -import com.intellij.psi.stubs.PsiFileStub -import java.util.stream.Collectors abstract class AbstractStubBuilderTest : KotlinTestWithEnvironment() { override fun createEnvironment(): KotlinCoreEnvironment { - return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(ApplicationEnvironmentDisposer.ROOT_DISPOSABLE, ConfigurationKind.JDK_NO_RUNTIME) + return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations( + ApplicationEnvironmentDisposer.ROOT_DISPOSABLE, + ConfigurationKind.JDK_NO_RUNTIME + ) } override fun setUp() { @@ -45,8 +48,10 @@ abstract class AbstractStubBuilderTest : KotlinTestWithEnvironment() { } private fun CoreApplicationEnvironment.registerApplicationServices() { - registerApplicationService(FileAttributeService::class.java, DummyFileAttributeService) - registerApplicationService(ClsKotlinBinaryClassCache::class.java, ClsKotlinBinaryClassCache()) + if (application.getService(FileAttributeService::class.java) == null) { + registerApplicationService(FileAttributeService::class.java, DummyFileAttributeService) + registerApplicationService(ClsKotlinBinaryClassCache::class.java, ClsKotlinBinaryClassCache()) + } } fun runTest(testDirectory: String) {