diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt index 55e4d608146..fe49033a65a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.caches import com.intellij.openapi.Disposable -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.fileTypes.FileTypeRegistry import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project @@ -61,7 +61,7 @@ class KotlinPackageContentModificationListener( fun onEvents(events: List) { - val service = project.service() + val service = ServiceManager.getService(project, PerModulePackageCacheService::class.java) if (events.size >= FULL_DROP_THRESHOLD) { service.onTooComplexChange() } @@ -90,12 +90,12 @@ class KotlinPackageStatementPsiTreeChangePreprocessor(private val project: Proje PsiTreeChangeEventImpl.PsiEventType.CHILD_REMOVED -> { val child = event.child ?: return if (child.getParentOfType(false) != null) - project.service().notifyPackageChange(file) + ServiceManager.getService(project, PerModulePackageCacheService::class.java).notifyPackageChange(file) } PsiTreeChangeEventImpl.PsiEventType.CHILDREN_CHANGED -> { val parent = event.parent ?: return if (parent.getChildrenOfType().any()) - project.service().notifyPackageChange(file) + ServiceManager.getService(project, PerModulePackageCacheService::class.java).notifyPackageChange(file) } else -> { } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt index 01511ccdd8a..723c7324e3b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.caches.resolve -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project @@ -84,7 +84,7 @@ fun createModuleResolverProvider( delegateResolver, { _, c -> IDEPackagePartProvider(c.moduleContentScope) }, analysisSettings.sdk?.let { SdkInfo(project, it) }, modulePlatforms = { module -> module.platform?.multiTargetPlatform }, - packageOracleFactory = project.service(), + packageOracleFactory = ServiceManager.getService(project, IdePackageOracleFactory::class.java), languageSettingsProvider = IDELanguageSettingsProvider, invalidateOnOOCB = invalidateOnOOCB ) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt index 08e013c0693..535ad08ae75 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.caches.resolve -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.ProjectRootManager @@ -87,7 +87,7 @@ class ScriptDependenciesModuleInfo( ScriptDependenciesManager.getInstance(project).getAllScriptsClasspathScope(), project ) } - return project.service().get(scriptModuleInfo.externalDependencies) + return ServiceManager.getService(project, ScriptBinariesScopeCache::class.java).get(scriptModuleInfo.externalDependencies) } // NOTE: intentionally not taking corresponding script info into account diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/packageOracles.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/packageOracles.kt index e2865b9facb..b5959a48631 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/packageOracles.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/packageOracles.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.caches.resolve -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.analyzer.PackageOracle @@ -46,13 +46,13 @@ class IdePackageOracleFactory(val project: Project) : PackageOracleFactory { private class JavaPackagesOracle(moduleInfo: IdeaModuleInfo, project: Project) : PackageOracle { private val scope = moduleInfo.contentScope() - private val facade = project.service() + private val facade = ServiceManager.getService(project, KotlinJavaPsiFacade::class.java) override fun packageExists(fqName: FqName) = facade.findPackage(fqName.asString(), scope) != null } private class KotlinSourceFilesOracle(private val moduleInfo: ModuleSourceInfo) : PackageOracle { - private val cacheService = moduleInfo.module.project.service() + private val cacheService = ServiceManager.getService(moduleInfo.module.project, PerModulePackageCacheService::class.java) override fun packageExists(fqName: FqName): Boolean { return cacheService.packageExists(fqName, moduleInfo) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt index 990345d2a51..748e7a070cb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.stubindex.resolve -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import com.intellij.psi.PsiManager import com.intellij.psi.search.GlobalSearchScope @@ -63,7 +63,7 @@ class PluginDeclarationProviderFactory( private fun stubBasedPackageExists(name: FqName): Boolean { // We're only looking for source-based declarations val moduleSourceInfo = moduleInfo as? ModuleSourceInfo ?: return false - return project.service().packageExists(name, moduleSourceInfo) + return ServiceManager.getService(project, PerModulePackageCacheService::class.java).packageExists(name, moduleInfo) } private fun getStubBasedPackageMemberDeclarationProvider(name: FqName): PackageMemberDeclarationProvider? { @@ -97,7 +97,7 @@ class PluginDeclarationProviderFactory( val packageExists = PackageIndexUtil.packageExists(fqName, indexedFilesScope, project) val spiPackageExists = subpackagesIndex.packageExists(fqName) val oldPackageExists = oldPackageExists(fqName) - val cachedPackageExists = moduleSourceInfo?.let { project.service().packageExists(fqName, it) } + val cachedPackageExists = moduleSourceInfo?.let { ServiceManager.getService(project, PerModulePackageCacheService::class.java).packageExists(fqName, it) } val moduleModificationCount = moduleSourceInfo?.createModificationTracker()?.modificationCount val common = """ diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt index 57531f60b03..fd1b9316ca7 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.core.script -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.extensions.Extensions @@ -91,7 +91,7 @@ class ScriptDefinitionsManager(private val project: Project): ScriptDefinitionPr private fun updateDefinitions() { definitions = definitionsByContributor.values.flattenTo(mutableListOf()) // TODO: clear by script type/definition - project.service().clear() + ServiceManager.getService(project, ScriptDependenciesUpdater::class.java).clear() } private fun ScriptDefinitionContributor.safeGetDefinitions(): List { @@ -106,7 +106,7 @@ class ScriptDefinitionsManager(private val project: Project): ScriptDefinitionPr } companion object { - fun getInstance(project: Project): ScriptDefinitionsManager = project.service() as ScriptDefinitionsManager + fun getInstance(project: Project): ScriptDefinitionsManager = ServiceManager.getService(project, ScriptDefinitionProvider::class.java) as ScriptDefinitionsManager } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt index 6662cf8db93..c47cb29a5eb 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.core.script -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileWithId import com.intellij.util.io.DataInputOutputUtil.readSeq @@ -33,7 +33,7 @@ object ScriptDependenciesFileAttribute { private val VERSION = 1 private val ID = "kotlin-script-dependencies" - private val fileAttributeService = service() + private val fileAttributeService = ServiceManager.getService(FileAttributeService::class.java) init { fileAttributeService.register(ID, VERSION, false) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/CoroutineUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/CoroutineUtils.kt index 44d485f86fc..176ca6e0006 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/CoroutineUtils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/CoroutineUtils.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.core.util import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ModalityState -import com.intellij.openapi.components.service +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer import kotlinx.coroutines.experimental.CoroutineDispatcher @@ -47,7 +47,7 @@ public object EDT : CoroutineDispatcher() { // job that is cancelled when the project is disposed val Project.cancelOnDisposal: Job - get() = service().sharedJob + get() = ServiceManager.getService(this, ProjectJob::class.java).sharedJob internal class ProjectJob(project: Project) { internal val sharedJob: Job = Job()