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

[Analysis] do not reregister services in AbstractStubBuilderTest

Browse Source
This commit is contained in:
Ilya Kirillov
2022-06-29 16:39:28 +02:00
parent 271ecfbd68
commit 77758d1552
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractStubBuilderTest.kt
+10 -5
View File
@@ -11,6 +11,7 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.impl.DebugUtil import com.intellij.psi.impl.DebugUtil
import com.intellij.psi.stubs.PsiFileStub
import com.intellij.psi.stubs.StubElement import com.intellij.psi.stubs.StubElement
import org.jetbrains.kotlin.analysis.decompiler.stub.file.CachedAttributeData import org.jetbrains.kotlin.analysis.decompiler.stub.file.CachedAttributeData
import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache 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.Files
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
import java.util.stream.Collectors
import kotlin.io.path.absolutePathString import kotlin.io.path.absolutePathString
import kotlin.io.path.name import kotlin.io.path.name
import kotlin.io.path.readText import kotlin.io.path.readText
import com.intellij.psi.stubs.PsiFileStub
import java.util.stream.Collectors
abstract class AbstractStubBuilderTest : KotlinTestWithEnvironment() { abstract class AbstractStubBuilderTest : KotlinTestWithEnvironment() {
override fun createEnvironment(): KotlinCoreEnvironment { 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() { override fun setUp() {
@@ -45,8 +48,10 @@ abstract class AbstractStubBuilderTest : KotlinTestWithEnvironment() {
} }
private fun CoreApplicationEnvironment.registerApplicationServices() { private fun CoreApplicationEnvironment.registerApplicationServices() {
registerApplicationService(FileAttributeService::class.java, DummyFileAttributeService) if (application.getService(FileAttributeService::class.java) == null) {
registerApplicationService(ClsKotlinBinaryClassCache::class.java, ClsKotlinBinaryClassCache()) registerApplicationService(FileAttributeService::class.java, DummyFileAttributeService)
registerApplicationService(ClsKotlinBinaryClassCache::class.java, ClsKotlinBinaryClassCache())
}
} }
fun runTest(testDirectory: String) { fun runTest(testDirectory: String) {