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

[213] Switch to 213 platform

Browse Source 
KTI-1114
This commit is contained in:
Roman Golyshev
2022-07-19 17:15:29 +02:00
committed by Space Team
parent 7f07b2a82c
commit d4cffb8a5a
94 changed files with 173 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/Fe10AnalysisFacade.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.api.descriptors
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin
@@ -25,7 +24,7 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
interface Fe10AnalysisFacade {
companion object {
fun getInstance(project: Project): Fe10AnalysisFacade {
return ServiceManager.getService(project, Fe10AnalysisFacade::class.java)
return project.getService(Fe10AnalysisFacade::class.java)
}
}
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt
+2
View File
@@ -25,11 +25,13 @@ import org.jetbrains.kotlin.test.services.TestServices
object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {
@Suppress("UnstableApiUsage")
project.extensionArea.apply {
registerExtensionPoint(
KtResolveExtensionProvider.EP_NAME.name,
KtResolveExtensionProvider::class.java.name,
ExtensionPoint.Kind.INTERFACE,
false
)
}
}
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinAnnotationsResolver.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.providers
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.name.ClassId
@@ -50,5 +49,5 @@ public interface KotlinAnnotationsResolverFactory {
}
public fun Project.createAnnotationResolver(searchScope: GlobalSearchScope): KotlinAnnotationsResolver =
ServiceManager.getService(this, KotlinAnnotationsResolverFactory::class.java)
this.getService(KotlinAnnotationsResolverFactory::class.java)
.createAnnotationResolver(searchScope)
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinDeclarationProvider.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.providers
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.name.CallableId
@@ -47,5 +46,5 @@ public abstract class KotlinDeclarationProviderFactory {
}
public fun Project.createDeclarationProvider(searchScope: GlobalSearchScope): KotlinDeclarationProvider =
ServiceManager.getService(this, KotlinDeclarationProviderFactory::class.java)
this.getService(KotlinDeclarationProviderFactory::class.java)
.createDeclarationProvider(searchScope)
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinModificationTrackerFactory.kt
+3 -4
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.providers
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.ModificationTracker
import org.jetbrains.annotations.TestOnly
@@ -109,7 +108,7 @@ public interface KtModuleStateTracker {
* @see ModificationTracker
*/
public fun Project.createProjectWideOutOfBlockModificationTracker(): ModificationTracker =
ServiceManager.getService(this, KotlinModificationTrackerFactory::class.java)
this.getService(KotlinModificationTrackerFactory::class.java)
.createProjectWideOutOfBlockModificationTracker()
/**
@@ -119,7 +118,7 @@ public fun Project.createProjectWideOutOfBlockModificationTracker(): Modificatio
* @see ModificationTracker
*/
public fun KtSourceModule.createModuleWithoutDependenciesOutOfBlockModificationTracker(project: Project): ModificationTracker =
ServiceManager.getService(project, KotlinModificationTrackerFactory::class.java)
project.getService(KotlinModificationTrackerFactory::class.java)
.createModuleWithoutDependenciesOutOfBlockModificationTracker(this)
/**
@@ -129,5 +128,5 @@ public fun KtSourceModule.createModuleWithoutDependenciesOutOfBlockModificationT
* @see ModificationTracker
*/
public fun Project.createAllLibrariesModificationTracker(): ModificationTracker =
ServiceManager.getService(this, KotlinModificationTrackerFactory::class.java)
this.getService(KotlinModificationTrackerFactory::class.java)
.createLibrariesWideModificationTracker()
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinPackageProvider.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.providers
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.name.FqName
@@ -78,5 +77,5 @@ public abstract class KotlinPackageProviderFactory {
}
public fun Project.createPackageProvider(searchScope: GlobalSearchScope): KotlinPackageProvider =
ServiceManager.getService(this, KotlinPackageProviderFactory::class.java)
this.getService(KotlinPackageProviderFactory::class.java)
.createPackageProvider(searchScope)
analysis/analysis-api-standalone/analysis-api-standalone-base/src/org/jetbrains/kotlin/analysis/api/standalone/base/project/structure/StandaloneProjectFactory.kt
+1 -2
View File
@@ -12,7 +12,6 @@ import com.intellij.core.CorePackageIndex
import com.intellij.ide.highlighter.JavaFileType
import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.roots.PackageIndex
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager
@@ -62,7 +61,7 @@ object StandaloneProjectFactory {
with(project) {
registerService(
CoreJavaFileManager::class.java,
ServiceManager.getService(this, JavaFileManager::class.java) as CoreJavaFileManager
this.getService(JavaFileManager::class.java) as CoreJavaFileManager
)
registerService(ExternalAnnotationsManager::class.java, MockExternalAnnotationsManager())
analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneUtils.kt
+18 -18
View File
@@ -107,8 +107,8 @@ internal fun configureProjectEnvironment(
) {
reRegisterJavaElementFinder(project)
project.picoContainer.registerComponentInstance(
KotlinModificationTrackerFactory::class.qualifiedName,
project.registerService(
KotlinModificationTrackerFactory::class.java,
KotlinStaticModificationTrackerFactory()
)
@@ -134,37 +134,37 @@ internal fun configureProjectEnvironment(
)
RegisterComponentService.registerLLFirResolveSessionService(project)
project.picoContainer.registerComponentInstance(
FirSealedClassInheritorsProcessorFactory::class.qualifiedName,
project.registerService(
FirSealedClassInheritorsProcessorFactory::class.java,
object : FirSealedClassInheritorsProcessorFactory() {
override fun createSealedClassInheritorsProvider(): SealedClassInheritorsProvider {
return SealedClassInheritorsProviderImpl
}
}
)
project.picoContainer.registerComponentInstance(
KtModuleScopeProvider::class.qualifiedName,
project.registerService(
KtModuleScopeProvider::class.java,
KtModuleScopeProviderImpl()
)
project.picoContainer.registerComponentInstance(
ProjectStructureProvider::class.qualifiedName,
project.registerService(
ProjectStructureProvider::class.java,
buildKtModuleProviderByCompilerConfiguration(
compilerConfig,
project,
ktFiles,
)
)
project.picoContainer.registerComponentInstance(
KotlinDeclarationProviderFactory::class.qualifiedName,
project.registerService(
KotlinDeclarationProviderFactory::class.java,
KotlinStaticDeclarationProviderFactory(project, ktFiles)
)
project.picoContainer.registerComponentInstance(
KotlinPackageProviderFactory::class.qualifiedName,
project.registerService(
KotlinPackageProviderFactory::class.java,
KotlinStaticPackageProviderFactory(project, ktFiles)
)
project.picoContainer.registerComponentInstance(
PackagePartProviderFactory::class.qualifiedName,
project.registerService(
PackagePartProviderFactory::class.java,
KotlinStaticPackagePartProviderFactory(packagePartProvider)
)
}
@@ -173,13 +173,13 @@ internal fun configureProjectEnvironment(
private fun reRegisterJavaElementFinder(project: Project) {
PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java)
with(project as MockProject) {
picoContainer.registerComponentInstance(
KtAnalysisSessionProvider::class.qualifiedName,
registerService(
KtAnalysisSessionProvider::class.java,
KtFirAnalysisSessionProvider(this)
)
picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName)
picoContainer.registerComponentInstance(
KotlinAsJavaSupport::class.qualifiedName,
registerService(
KotlinAsJavaSupport::class.java,
SymbolKotlinAsJavaSupport(project)
)
}
analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/session/KtAnalysisSessionProvider.kt
+1 -3
View File
@@ -6,14 +6,12 @@
package org.jetbrains.kotlin.analysis.api.session
import com.intellij.openapi.Disposable
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.lifetime.impl.NoWriteActionInAnalyseCallChecker
import org.jetbrains.kotlin.analysis.api.lifetime.KtDefaultLifetimeTokenProvider
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory
import org.jetbrains.kotlin.analysis.project.structure.KtModule
import org.jetbrains.kotlin.psi.KtElement
@@ -92,6 +90,6 @@ public abstract class KtAnalysisSessionProvider(public val project: Project) : D
public companion object {
@KtAnalysisApiInternals
public fun getInstance(project: Project): KtAnalysisSessionProvider =
ServiceManager.getService(project, KtAnalysisSessionProvider::class.java)
project.getService(KtAnalysisSessionProvider::class.java)
}
}
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfigurator.kt
+1 -2
View File
@@ -9,7 +9,6 @@ import com.intellij.mock.MockApplication
import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.Application
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key
import com.intellij.psi.PsiFile
@@ -41,7 +40,7 @@ abstract class AnalysisApiTestConfigurator {
open fun prepareFilesInModule(files: List<PsiFile>, module: TestModule, testServices: TestServices) {}
open fun doOutOfBlockModification(file: KtFile) {
ServiceManager.getService(file.project, KotlinModificationTrackerFactory::class.java)
file.project.getService(KotlinModificationTrackerFactory::class.java)
.incrementModificationsCount()
}
analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KotlinPsiReferenceProvider.kt
+1 -1
View File
@@ -21,7 +21,7 @@ interface KotlinReferenceProviderContributor {
companion object {
fun getInstance(project: Project): KotlinReferenceProviderContributor =
ServiceManager.getService(project, KotlinReferenceProviderContributor::class.java)
project.getService(KotlinReferenceProviderContributor::class.java)
}
}
analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.references
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.application.ApplicationManager
import com.intellij.psi.*
import com.intellij.psi.impl.source.resolve.ResolveCache
import org.jetbrains.kotlin.asJava.unwrapped
@@ -44,7 +44,7 @@ abstract class AbstractKtReference<T : KtElement>(element: T) : PsiPolyVariantRe
getKtReferenceMutateService().bindToElement(this, element)
protected fun getKtReferenceMutateService(): KtReferenceMutateService =
ServiceManager.getService(KtReferenceMutateService::class.java)
ApplicationManager.getApplication().getService(KtReferenceMutateService::class.java)
?: throw IllegalStateException("Cannot handle element rename because KtReferenceMutateService is missing")
@Suppress("UNCHECKED_CAST")
analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.asJava
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass
import com.intellij.psi.search.GlobalSearchScope
@@ -63,7 +62,7 @@ abstract class KotlinAsJavaSupport {
companion object {
@JvmStatic
fun getInstance(project: Project): KotlinAsJavaSupport {
return ServiceManager.getService(project, KotlinAsJavaSupport::class.java)
return project.getService( KotlinAsJavaSupport::class.java)
}
}
}
analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.asJava.classes
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.TextRange
import com.intellij.psi.*
@@ -187,7 +186,7 @@ interface LightClassInheritanceHelper {
companion object {
fun getService(project: Project): LightClassInheritanceHelper =
ServiceManager.getService(project, LightClassInheritanceHelper::class.java) ?: NoHelp
project.getService(LightClassInheritanceHelper::class.java) ?: NoHelp
}
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirResolveStateService.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
@@ -45,6 +44,6 @@ class LLFirResolveSessionService(project: Project) {
companion object {
fun getInstance(project: Project): LLFirResolveSessionService =
ServiceManager.getService(project, LLFirResolveSessionService::class.java)
project.getService(LLFirResolveSessionService::class.java)
}
}
analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModuleScopeProvider.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.project.structure
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
@@ -38,4 +37,4 @@ public class KtModuleScopeProviderImpl : KtModuleScopeProvider() {
}
public val Project.moduleScopeProvider: KtModuleScopeProvider
get() = ServiceManager.getService(this, KtModuleScopeProvider::class.java)
get() = this.getService(KtModuleScopeProvider::class.java)