Minor: rename script related classes

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt

@@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.io.URLUtil
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.idea.caches.project.getAllProjectSdks
-import org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl
+import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
 import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult
@@ -146,7 +146,7 @@ interface ScriptConfigurationManager {
 
         @TestOnly
         fun updateScriptDependenciesSynchronously(file: PsiFile, project: Project) {
-            (getInstance(project) as ScriptConfigurationManagerImpl).updateScriptDependenciesSynchronously(file)
+            (getInstance(project) as DefaultScriptConfigurationManager).updateScriptDependenciesSynchronously(file)
         }
     }
 }

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptConfigurationManager.kt

@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptReportSink
 import kotlin.script.experimental.api.ScriptDiagnostic
 import kotlin.script.experimental.api.valueOrNull
 
-class ScriptConfigurationManagerImpl internal constructor(private val project: Project) :
+class DefaultScriptConfigurationManager internal constructor(private val project: Project) :
     ScriptConfigurationManager {
     private val rootsManager = ScriptClassRootsManager(project)
 

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/cache/ScriptConfigurationFileAttributeCache.kt

@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.idea.core.script.configuration.cache
 
 import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptDependenciesLoader
+import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptConfigurationLoader
 import org.jetbrains.kotlin.idea.core.script.debug
 import org.jetbrains.kotlin.idea.core.util.*
 import org.jetbrains.kotlin.psi.KtFile
@@ -22,7 +22,7 @@ import kotlin.script.experimental.api.asSuccess
 import kotlin.script.experimental.dependencies.ScriptDependencies
 
 class ScriptConfigurationFileAttributeCache :
-    ScriptDependenciesLoader {
+    ScriptConfigurationLoader {
     operator fun contains(file: VirtualFile): Boolean =
         file.scriptDependencies != null || file.scriptCompilationConfiguration != null
 

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt

@@ -17,15 +17,15 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import com.intellij.util.Alarm
-import org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl
+import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager
 import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.scripting.definitions.isNonScript
 
-class ScriptsListener(
+class ScriptChangesNotifier(
     private val project: Project,
-    private val scriptsManager: ScriptConfigurationManagerImpl
+    private val scriptsManager: DefaultScriptConfigurationManager
 ) {
     private val scriptsQueue = Alarm(Alarm.ThreadToUse.SWING_THREAD, project)
     private val scriptChangesListenerDelay = 1400

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/DefaultScriptConfigurationLoader.kt

@@ -15,8 +15,8 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResu
 import org.jetbrains.kotlin.scripting.resolve.refineScriptCompilationConfiguration
 import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
 
-class FromRefinedConfigurationLoader internal constructor() :
+class DefaultScriptConfigurationLoader internal constructor() :
-    ScriptDependenciesLoader {
+    ScriptConfigurationLoader {
     override fun isAsync(file: KtFile, scriptDefinition: ScriptDefinition): Boolean {
         return scriptDefinition.asLegacyOrNull<KotlinScriptDefinition>()?.dependencyResolver?.let {
             it is AsyncDependenciesResolver || it is LegacyResolverWrapper

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptConfigurationLoader.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult
 
 // TODO: rename - this is not only about dependencies anymore
-internal interface ScriptDependenciesLoader {
+internal interface ScriptConfigurationLoader {
     fun isAsync(file: KtFile, scriptDefinition: ScriptDefinition) = false
 
     val skipSaveToAttributes: Boolean

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptOutsiderFileConfigurationLoader.kt

@@ -6,15 +6,15 @@
 package org.jetbrains.kotlin.idea.core.script.configuration.loader
 
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl
+import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager
 import org.jetbrains.kotlin.idea.highlighter.OutsidersPsiFileSupportUtils
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult
 import kotlin.script.experimental.api.asSuccess
 
-class OutsiderFileDependenciesLoader(private val manager: ScriptConfigurationManagerImpl) :
+class ScriptOutsiderFileConfigurationLoader(private val manager: DefaultScriptConfigurationManager) :
-    ScriptDependenciesLoader {
+    ScriptConfigurationLoader {
     override val skipSaveToAttributes: Boolean
         get() = true
 

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundExecutor.kt

@@ -14,9 +14,9 @@ import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
 import org.jetbrains.kotlin.psi.KtFile
 import java.util.concurrent.ConcurrentLinkedQueue
 
-internal class BackgroundLoader(
+internal class BackgroundExecutor(
     private val project: Project,
-    private val rootsManager: ScriptClassRootsManager,
+    private val rootsManager: ScriptClassRootsIndexer,
     private val loadDependencies: (KtFile) -> Unit
 ) {
     private var task: Task? = null

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsIndexer.kt

@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger
 /**
  * Utility for postponing indexing of new roots at the end of some bulk operation.
  */
-internal class ScriptClassRootsManager(val project: Project) {
+internal class ScriptClassRootsIndexer(val project: Project) {
     private var newRootsPresent: Boolean = false
     private val concurrentTransactions = AtomicInteger()
 

idea/resources/META-INF/plugin-common.xml

@@ -308,7 +308,7 @@
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.IdeScriptDependenciesProvider"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager"
-                    serviceImplementation="org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl"/>
+                    serviceImplementation="org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.scripting.resolve.ScriptReportSink"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink"/>