MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't use app.coroutineScope

Browse Source 
GitOrigin-RevId: d06592f38d02ccb50976b1b96ee710e23d431f24
This commit is contained in:
Vladimir Krivosheev
2023-05-23 23:25:04 +00:00
committed by intellij-monorepo-bot
parent d594cea294
commit c34997fd7a
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/ide-core/src/com/intellij/ide/RecentProjectsManager.kt
+3 -2
View File
@@ -1,8 +1,9 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.ide
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import com.intellij.util.PathUtil
import com.intellij.util.concurrency.annotations.RequiresEdt
@@ -17,7 +18,7 @@ interface RecentProjectsManager {
val RECENT_PROJECTS_CHANGE_TOPIC: Topic<RecentProjectsChange> = Topic(RecentProjectsChange::class.java, Topic.BroadcastDirection.NONE)
@JvmStatic
fun getInstance(): RecentProjectsManager = ApplicationManager.getApplication().getService(RecentProjectsManager::class.java)
fun getInstance(): RecentProjectsManager = ApplicationManager.getApplication().service<RecentProjectsManager>()
}
// a path pointing to a directory where the last project was created or null if not available
platform/platform-impl/src/com/intellij/idea/IdeStarter.kt
+12 -11
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.application.ex.ApplicationEx
import com.intellij.openapi.application.ex.ApplicationManagerEx
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.components.serviceAsync
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.project.Project
@@ -68,7 +69,7 @@ open class IdeStarter : ModernApplicationStarter() {
coroutineScope {
val app = ApplicationManagerEx.getApplicationEx()
val lifecyclePublisher = app.messageBus.syncPublisher(AppLifecycleListener.TOPIC)
openProjectIfNeeded(args = args, app = app, lifecyclePublisher = lifecyclePublisher)
openProjectIfNeeded(args = args, app = app, asyncCoroutineScope = this, lifecyclePublisher = lifecyclePublisher)
launch { reportPluginErrors() }
@@ -84,6 +85,7 @@ open class IdeStarter : ModernApplicationStarter() {
@OptIn(IntellijInternalApi::class)
protected open suspend fun openProjectIfNeeded(args: List<String>,
app: ApplicationEx,
asyncCoroutineScope: CoroutineScope,
lifecyclePublisher: AppLifecycleListener) {
val frameInitActivity = startActivity("frame initialization")
frameInitActivity.runChild("app frame created callback") {
@@ -97,16 +99,14 @@ open class IdeStarter : ModernApplicationStarter() {
return
}
if (app.isInternal) {
@Suppress("DEPRECATION")
app.coroutineScope.launch(Dispatchers.EDT + ModalityState.any().asContextElement()) {
UiInspectorAction.initGlobalInspector()
}
asyncCoroutineScope.launch {
LifecycleUsageTriggerCollector.onIdeStart()
}
@Suppress("DEPRECATION")
app.coroutineScope.launch {
LifecycleUsageTriggerCollector.onIdeStart()
if (app.isInternal) {
asyncCoroutineScope.launch(Dispatchers.EDT + ModalityState.any().asContextElement()) {
UiInspectorAction.initGlobalInspector()
}
}
if (uriToOpen != null || args.isNotEmpty() && args.first().contains(SCHEME_SEPARATOR)) {
@@ -115,7 +115,7 @@ open class IdeStarter : ModernApplicationStarter() {
return
}
val recentProjectManager = RecentProjectsManager.getInstance()
val recentProjectManager = ApplicationManager.getApplication().serviceAsync<RecentProjectsManager>()
val willReopenRecentProjectOnStart = recentProjectManager.willReopenProjectOnStart()
val willOpenProject = willReopenRecentProjectOnStart || !args.isEmpty() || !filesToLoad.isEmpty()
val needToOpenProject = willOpenProject || showWelcomeFrame(lifecyclePublisher)
@@ -175,6 +175,7 @@ open class IdeStarter : ModernApplicationStarter() {
internal class StandaloneLightEditStarter : IdeStarter() {
override suspend fun openProjectIfNeeded(args: List<String>,
app: ApplicationEx,
asyncCoroutineScope: CoroutineScope,
lifecyclePublisher: AppLifecycleListener) {
val project = when {
filesToLoad.isNotEmpty() -> ProjectUtil.openOrImportFilesAsync(list = filesToLoad, location = "MacMenu")
@@ -189,7 +190,7 @@ open class IdeStarter : ModernApplicationStarter() {
val recentProjectManager = RecentProjectsManager.getInstance()
val isOpened = (if (recentProjectManager.willReopenProjectOnStart()) recentProjectManager.reopenLastProjectsOnStart() else true)
if (!isOpened) {
ApplicationManager.getApplication().invokeLater {
asyncCoroutineScope.launch(Dispatchers.EDT) {
LightEditService.getInstance().showEditorWindow()
}
}