diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt index 0aee3af76d6..ad9467221bc 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt @@ -69,9 +69,9 @@ class ScriptDependenciesCache(private val project: Project) { this::allLibrarySourcesScope.clearValue() val kotlinScriptDependenciesClassFinder = - Extensions.getArea(project).getExtensionPoint(PsiElementFinder.EP_NAME).extensions - .filterIsInstance() - .single() + Extensions.getArea(project).getExtensionPoint(PsiElementFinder.EP_NAME).extensions + .filterIsInstance() + .single() kotlinScriptDependenciesClassFinder.clearCache() updateHighlighting(files) @@ -91,7 +91,7 @@ class ScriptDependenciesCache(private val project: Project) { fun hasNotCachedRoots(scriptDependencies: ScriptDependencies): Boolean { return !allScriptsClasspath.containsAll(ScriptDependenciesManager.toVfsRoots(scriptDependencies.classpath)) || - !allLibrarySources.containsAll(ScriptDependenciesManager.toVfsRoots(scriptDependencies.sources)) + !allLibrarySources.containsAll(ScriptDependenciesManager.toVfsRoots(scriptDependencies.sources)) } fun clear() { @@ -143,11 +143,11 @@ class ScriptDependenciesCache(private val project: Project) { } return ScriptDependencies( - classpath = binaries.distinct(), - sources = sources.distinct(), - imports = imports.distinct(), - scripts = scripts.distinct(), - javaHome = relevantEntries.map { it.javaHome }.firstOrNull() + classpath = binaries.distinct(), + sources = sources.distinct(), + imports = imports.distinct(), + scripts = scripts.distinct(), + javaHome = relevantEntries.map { it.javaHome }.firstOrNull() ) } } @@ -157,7 +157,10 @@ private fun KProperty0.clearValue() { (getDelegate() as ClearableLazyValue<*, *>).clear() } -private class ClearableLazyValue(private val lock: ReentrantReadWriteLock, private val compute: () -> T): ReadOnlyProperty { +private class ClearableLazyValue( + private val lock: ReentrantReadWriteLock, + private val compute: () -> T +) : ReadOnlyProperty { override fun getValue(thisRef: R, property: KProperty<*>): T { lock.read { if (value == null) { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt index 5bff56c9fca..8aac4afd082 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt @@ -33,7 +33,7 @@ import kotlin.script.experimental.dependencies.ScriptDependencies // NOTE: this service exists exclusively because ScriptDependencyManager // cannot be registered as implementing two services (state would be duplicated) class IdeScriptDependenciesProvider( - private val scriptDependenciesManager: ScriptDependenciesManager + private val scriptDependenciesManager: ScriptDependenciesManager ) : ScriptDependenciesProvider { override fun getScriptDependencies(file: VirtualFile): ScriptDependencies? { return scriptDependenciesManager.getScriptDependencies(file) @@ -41,8 +41,8 @@ class IdeScriptDependenciesProvider( } class ScriptDependenciesManager internal constructor( - private val cacheUpdater: ScriptDependenciesUpdater, - private val cache: ScriptDependenciesCache + private val cacheUpdater: ScriptDependenciesUpdater, + private val cache: ScriptDependenciesCache ) { fun getScriptClasspath(file: VirtualFile): List = toVfsRoots(cacheUpdater.getCurrentDependencies(file).classpath) fun getScriptDependencies(file: VirtualFile): ScriptDependencies = cacheUpdater.getCurrentDependencies(file) @@ -55,7 +55,7 @@ class ScriptDependenciesManager internal constructor( companion object { @JvmStatic fun getInstance(project: Project): ScriptDependenciesManager = - ServiceManager.getService(project, ScriptDependenciesManager::class.java) + ServiceManager.getService(project, ScriptDependenciesManager::class.java) fun toVfsRoots(roots: Iterable): List { return roots.mapNotNull { it.classpathEntryToVfs() } diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt index 1e7019079e2..65d66963b5e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt @@ -90,8 +90,8 @@ private const val configureConflictingModule = "// CONFLICTING_MODULE" private fun String.splitOrEmpty(delimeters: String) = split(delimeters).takeIf { it.size > 1 } ?: emptyList() internal val switches = listOf( - useDefaultTemplate, - configureConflictingModule + useDefaultTemplate, + configureConflictingModule ) abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { @@ -181,11 +181,11 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { val libClasses = libSrcDir?.let { compileLibToDir(it) } return mapOf( - "runtime-classes" to ForTestCompileRuntime.runtimeJarForTests(), - "runtime-source" to File("libraries/stdlib/src"), - "lib-classes" to libClasses, - "lib-source" to libSrcDir, - "template-classes" to templateOutDir + "runtime-classes" to ForTestCompileRuntime.runtimeJarForTests(), + "runtime-source" to File("libraries/stdlib/src"), + "lib-classes" to libClasses, + "lib-source" to libSrcDir, + "template-classes" to templateOutDir ) } @@ -221,8 +221,8 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { val javaSourceFiles = FileUtil.findFilesByMask(Pattern.compile(".+\\.java$"), srcDir) if (javaSourceFiles.isNotEmpty()) { KotlinTestUtils.compileJavaFiles( - javaSourceFiles, - listOf("-cp", StringUtil.join(listOf(*classpath, outDir), File.pathSeparator), "-d", outDir.path) + javaSourceFiles, + listOf("-cp", StringUtil.join(listOf(*classpath, outDir), File.pathSeparator), "-d", outDir.path) ) } return outDir @@ -231,16 +231,15 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { private fun registerScriptTemplateProvider(environment: Environment) { val provider = if (environment[useDefaultTemplate] == true) { FromTextTemplateProvider(environment) - } - else { + } else { CustomScriptTemplateProvider(environment) } PlatformTestUtil.registerExtension( - Extensions.getArea(project), - ScriptDefinitionContributor.EP_NAME, - provider, - testRootDisposable + Extensions.getArea(project), + ScriptDefinitionContributor.EP_NAME, + provider, + testRootDisposable ) ScriptDefinitionsManager.getInstance(project).reloadScriptDefinitions() }