Rename ScriptDependenciesManager to ScriptConfigurationManager
This commit is contained in:
+7
-7
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.projectRoots.Sdk
|
||||
import com.intellij.openapi.vfs.VirtualFile
|
||||
import com.intellij.psi.search.GlobalSearchScope
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
|
||||
import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptAdditionalIdeaDependenciesProvider
|
||||
import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
|
||||
import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
|
||||
@@ -90,13 +90,13 @@ sealed class ScriptDependenciesInfo(val project: Project) : IdeaModuleInfo, Bina
|
||||
) : ScriptDependenciesInfo(project) {
|
||||
override val sdk: Sdk?
|
||||
get() {
|
||||
return ScriptDependenciesManager.getInstance(project).getScriptSdk(scriptFile)
|
||||
return ScriptConfigurationManager.getInstance(project).getScriptSdk(scriptFile)
|
||||
}
|
||||
|
||||
override fun contentScope(): GlobalSearchScope {
|
||||
// TODO: this is not very efficient because KotlinSourceFilterScope already checks if the files are in scripts classpath
|
||||
return KotlinSourceFilterScope.libraryClassFiles(
|
||||
ScriptDependenciesManager.getInstance(project).getScriptDependenciesClassFilesScope(scriptFile), project
|
||||
ScriptConfigurationManager.getInstance(project).getScriptDependenciesClassFilesScope(scriptFile), project
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -105,13 +105,13 @@ sealed class ScriptDependenciesInfo(val project: Project) : IdeaModuleInfo, Bina
|
||||
class ForProject(project: Project) : ScriptDependenciesInfo(project) {
|
||||
override val sdk: Sdk?
|
||||
get() {
|
||||
return ScriptDependenciesManager.getInstance(project).getFirstScriptsSdk()
|
||||
?: ScriptDependenciesManager.getScriptDefaultSdk(project)
|
||||
return ScriptConfigurationManager.getInstance(project).getFirstScriptsSdk()
|
||||
?: ScriptConfigurationManager.getScriptDefaultSdk(project)
|
||||
}
|
||||
|
||||
override fun contentScope(): GlobalSearchScope {
|
||||
return KotlinSourceFilterScope.libraryClassFiles(
|
||||
ScriptDependenciesManager.getInstance(project).getAllScriptsDependenciesClassFilesScope(), project
|
||||
ScriptConfigurationManager.getInstance(project).getAllScriptsDependenciesClassFilesScope(), project
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -124,7 +124,7 @@ sealed class ScriptDependenciesSourceInfo(val project: Project) : IdeaModuleInfo
|
||||
get() = ScriptDependenciesInfo.ForProject(project)
|
||||
|
||||
override fun sourceScope(): GlobalSearchScope = KotlinSourceFilterScope.librarySources(
|
||||
ScriptDependenciesManager.getInstance(project).getAllScriptDependenciesSourcesScope(), project
|
||||
ScriptConfigurationManager.getInstance(project).getAllScriptDependenciesSourcesScope(), project
|
||||
)
|
||||
|
||||
override fun hashCode() = project.hashCode()
|
||||
|
||||
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightElement
|
||||
import org.jetbrains.kotlin.caches.project.cacheInvalidatingOnRootModifications
|
||||
import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
|
||||
import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
|
||||
import org.jetbrains.kotlin.idea.core.script.scriptRelatedModuleName
|
||||
import org.jetbrains.kotlin.idea.highlighter.OutsidersPsiFileSupportUtils
|
||||
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
|
||||
@@ -240,7 +240,7 @@ private inline fun <T> collectInfosByVirtualFile(
|
||||
}
|
||||
|
||||
val isBinary = virtualFile.fileType.isKotlinBinary()
|
||||
val scriptConfigurationManager = ScriptDependenciesManager.getInstance(project)
|
||||
val scriptConfigurationManager = ScriptConfigurationManager.getInstance(project)
|
||||
if (isBinary && virtualFile in scriptConfigurationManager.getAllScriptsDependenciesClassFilesScope()) {
|
||||
if (treatAsLibrarySource) {
|
||||
onOccurrence(ScriptDependenciesSourceInfo.ForProject(project))
|
||||
|
||||
+2
-2
@@ -21,8 +21,8 @@ import com.intellij.psi.PsiManager
|
||||
import org.jetbrains.kotlin.idea.caches.project.NotUnderContentRootModuleInfo
|
||||
import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
|
||||
import org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
|
||||
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
|
||||
import org.jetbrains.kotlin.idea.util.isRunningInCidrIde
|
||||
import org.jetbrains.kotlin.psi.KtCodeFragment
|
||||
@@ -70,7 +70,7 @@ object KotlinHighlightingUtil {
|
||||
@Suppress("DEPRECATION")
|
||||
private fun shouldHighlightScript(ktFile: KtFile): Boolean {
|
||||
if (isRunningInCidrIde) return false // There is no Java support in CIDR. So do not highlight errors in KTS if running in CIDR.
|
||||
if (!ScriptDependenciesManager.getInstance(ktFile.project).isConfigurationCached(ktFile)) return false
|
||||
if (!ScriptConfigurationManager.getInstance(ktFile.project).isConfigurationCached(ktFile)) return false
|
||||
if (IdeScriptReportSink.getReports(ktFile).any { it.severity == ScriptDiagnostic.Severity.FATAL }) {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiDirectory
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFileSystemItem
|
||||
import org.jetbrains.kotlin.idea.KotlinModuleFileType
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
|
||||
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
|
||||
import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
|
||||
import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
|
||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||
@@ -131,7 +131,7 @@ object ProjectRootsUtil {
|
||||
val canContainClassFiles = fileType == ArchiveFileType.INSTANCE || file.isDirectory
|
||||
val isBinary = fileType.isKotlinBinary()
|
||||
|
||||
val scriptConfigurationManager = if (includeScriptDependencies) ScriptDependenciesManager.getInstance(project) else null
|
||||
val scriptConfigurationManager = if (includeScriptDependencies) ScriptConfigurationManager.getInstance(project) else null
|
||||
|
||||
if (includeLibraryClasses && (isBinary || canContainClassFiles)) {
|
||||
if (fileIndex.isInLibraryClasses(file)) return true
|
||||
|
||||
Reference in New Issue
Block a user