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

Clean up of plugin-common.xml and convert components to services

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2020-03-27 07:54:14 +00:00
parent 87006036be
commit 674f1d129f
41 changed files with 2027 additions and 4151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt
+3 -3
View File
@@ -10,7 +10,7 @@ import com.intellij.openapi.project.Project
import org.jetbrains.idea.maven.project.MavenImportListener
import org.jetbrains.idea.maven.project.MavenProject
import org.jetbrains.idea.maven.project.MavenProjectsManager
import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent
import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectService
import org.jetbrains.kotlin.idea.configuration.notifyOutdatedBundledCompilerIfNecessary
class MavenImportListener(val project: Project) : MavenProjectsManager.Listener {
@@ -19,7 +19,7 @@ class MavenImportListener(val project: Project) : MavenProjectsManager.Listener
MavenImportListener.TOPIC,
MavenImportListener { _: Collection<MavenProject>, _: List<Module> ->
notifyOutdatedBundledCompilerIfNecessary(project)
KotlinMigrationProjectComponent.getInstanceIfNotDisposed(project)?.onImportFinished()
KotlinMigrationProjectService.getInstanceIfNotDisposed(project)?.onImportFinished()
}
)
@@ -27,6 +27,6 @@ class MavenImportListener(val project: Project) : MavenProjectsManager.Listener
}
override fun projectsScheduled() {
KotlinMigrationProjectComponent.getInstanceIfNotDisposed(project)?.onImportAboutToStart()
KotlinMigrationProjectService.getInstanceIfNotDisposed(project)?.onImportAboutToStart()
}
}
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt
+4 -3
View File
@@ -13,8 +13,9 @@ import com.intellij.testFramework.runInEdtAndWait
import com.intellij.util.concurrency.FutureResult
import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent
import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectService
import org.jetbrains.kotlin.idea.configuration.MigrationInfo
import org.jetbrains.kotlin.idea.configuration.MigrationTestState
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
import org.junit.Assert
import org.junit.runner.RunWith
@@ -106,8 +107,8 @@ class MavenMigrateTest : MavenImportingTestCase() {
}
}
val importResult = FutureResult<KotlinMigrationProjectComponent.MigrationTestState?>()
val migrationProjectComponent = KotlinMigrationProjectComponent.getInstanceIfNotDisposed(myProject)
val importResult = FutureResult<MigrationTestState?>()
val migrationProjectComponent = KotlinMigrationProjectService.getInstanceIfNotDisposed(myProject)
?: error("Disposed project")
migrationProjectComponent.setImportFinishListener { migrationState ->