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

Scripting Plugin. Update CoreFileTypeRegistry under lock

Browse Source 
CoreFileTypeRegistry isn't thread-safe, so it should be updated under
application lock, to avoid concurrently mutating underlying structure
This commit is contained in:
Simon Ogorodnik
2022-08-19 17:57:09 +02:00
committed by teamcity
parent 53069ee03f
commit 0fea8073ef
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt
+7 -4
View File
@@ -10,6 +10,7 @@ import com.intellij.mock.MockProject
import com.intellij.openapi.fileTypes.FileTypeRegistry import com.intellij.openapi.fileTypes.FileTypeRegistry
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -99,10 +100,12 @@ class ScriptingCompilerConfigurationExtension(
// Register new file extensions // Register new file extensions
val fileTypeRegistry = FileTypeRegistry.getInstance() as CoreFileTypeRegistry val fileTypeRegistry = FileTypeRegistry.getInstance() as CoreFileTypeRegistry
scriptDefinitionProvider.getKnownFilenameExtensions().filter { KotlinCoreEnvironment.underApplicationLock {
fileTypeRegistry.getFileTypeByExtension(it) != KotlinFileType.INSTANCE scriptDefinitionProvider.getKnownFilenameExtensions().filter {
}.forEach { fileTypeRegistry.getFileTypeByExtension(it) != KotlinFileType.INSTANCE
fileTypeRegistry.registerFileType(KotlinFileType.INSTANCE, it) }.forEach {
fileTypeRegistry.registerFileType(KotlinFileType.INSTANCE, it)
}
} }
} }
} }