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

IJPL-162718 we don't need user progress for createProject - wizard progress is enough

Browse Source 
GitOrigin-RevId: 9dac25ec3764e6f6bd7eb46ed3011da0597c3b1a
This commit is contained in:
Vladimir Krivosheev
2024-09-30 07:43:36 +00:00
committed by intellij-monorepo-bot
parent 47aa859a4f
commit 21455e7254
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/resources/messages/ProjectConceptBundle.properties
-1
View File
@@ -15,7 +15,6 @@ toolwindow.title.project.view=Project
progress.text.project.checking.configuration=Checking project configuration\u2026
progress.title.project.loading.name=Loading {0} Project
progress.title.project.creating.name=Creating {0} Project
dialog.title.unsaved.project=Unsaved Project
notification.title.cannot.save.project=Could not save project
popup.title.recent.projects=Recent Projects
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.kt
+3 -9
View File
@@ -49,7 +49,6 @@ import com.intellij.openapi.progress.ProcessCanceledException
import com.intellij.openapi.progress.blockingContext
import com.intellij.openapi.progress.impl.CoreProgressManager
import com.intellij.openapi.progress.runBlockingCancellable
import com.intellij.openapi.progress.runBlockingModalWithRawProgressReporter
import com.intellij.openapi.project.*
import com.intellij.openapi.project.ex.ProjectEx
import com.intellij.openapi.project.ex.ProjectManagerEx
@@ -71,7 +70,6 @@ import com.intellij.platform.PlatformProjectOpenProcessor
import com.intellij.platform.PlatformProjectOpenProcessor.Companion.isLoadedFromCacheButHasNoModules
import com.intellij.platform.attachToProjectAsync
import com.intellij.platform.diagnostic.telemetry.impl.span
import com.intellij.platform.ide.progress.ModalTaskOwner
import com.intellij.platform.project.PROJECT_ID
import com.intellij.platform.project.ProjectEntitiesStorage
import com.intellij.platform.project.ProjectId
@@ -80,7 +78,6 @@ import com.intellij.projectImport.ProjectAttachProcessor
import com.intellij.serviceContainer.ComponentManagerImpl
import com.intellij.ui.IdeUICustomization
import com.intellij.util.ArrayUtil
import com.intellij.util.PathUtilRt
import com.intellij.util.PlatformUtils.isDataSpell
import com.intellij.util.concurrency.ThreadingAssertions
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
@@ -538,10 +535,7 @@ open class ProjectManagerImpl : ProjectManagerEx(), Disposable {
}
@Suppress("DEPRECATION")
val project = runBlockingModalWithRawProgressReporter(
owner = ModalTaskOwner.guess(),
title = IdeUICustomization.getInstance().projectMessage("progress.title.project.creating.name", name ?: PathUtilRt.getFileName(path)),
) {
val project = runUnderModalProgressIfIsEdt {
val file = toCanonicalName(path)
removeProjectConfigurationAndCaches(file)
val project = instantiateProject(projectStoreBaseDir = file, options = options)
@@ -1230,12 +1224,12 @@ private fun removeProjectConfigurationAndCaches(projectFile: Path) {
}
}
}
catch (ignored: IOException) {
catch (_: IOException) {
}
try {
getProjectDataPathRoot(projectFile).delete()
}
catch (ignored: IOException) {
catch (_: IOException) {
}
}