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

[terminal] IJPL-247240 Do not perform settings migration in IJ Light mode

Browse Source 
It is not required in this case, and also it is not possible - we don't have a connection to the backend to get the settings.


(cherry picked from commit 58911a63531bcbf6dd8164ebfc76efb70e1e4506)

IJ-CR-210406

GitOrigin-RevId: 80d94510d656faf8524da083f33702c9939c3a10
This commit is contained in:
Konstantin Hudyakov
2026-07-21 15:28:54 +00:00
committed by intellij-monorepo-bot
parent 99ef31d372
commit dc4c79f64f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/src/org/jetbrains/plugins/terminal/settings/impl/TerminalProjectOptionsMigration.kt
+7
View File
@@ -18,6 +18,7 @@ import com.intellij.platform.eel.provider.getEelDescriptor
import com.intellij.platform.ide.productMode.IdeProductMode
import com.intellij.platform.ide.progress.runWithModalProgressBlocking
import com.intellij.platform.project.projectId
import com.intellij.platform.rpc.RemoteApiProviderService
import com.intellij.util.ui.EDT
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
@@ -58,6 +59,12 @@ internal class TerminalProjectOptionsMigration(
return null
}
if (!service<RemoteApiProviderService>().isServiceOperational()) {
props.setValue(MIGRATION_ATTEMPTED_KEY, true)
LOG.info("Terminal project options migration skipped for project $project: no connection to the backend")
return null
}
val job = migrationJob ?: synchronized(this) {
migrationJob ?: coroutineScope.async {
getStateFromBackend(props)
plugins/terminal/src/org/jetbrains/plugins/terminal/settings/impl/TerminalTabsStorageMigration.kt
+7
View File
@@ -17,6 +17,7 @@ import com.intellij.platform.eel.provider.getEelDescriptor
import com.intellij.platform.ide.productMode.IdeProductMode
import com.intellij.platform.ide.progress.runWithModalProgressBlocking
import com.intellij.platform.project.projectId
import com.intellij.platform.rpc.RemoteApiProviderService
import com.intellij.util.ui.EDT
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
@@ -56,6 +57,12 @@ internal class TerminalTabsStorageMigration(
return null
}
if (!service<RemoteApiProviderService>().isServiceOperational()) {
props.setValue(MIGRATION_ATTEMPTED_KEY, true)
LOG.info("Terminal tabs storage migration skipped for project $project: no connection to the backend")
return null
}
val job = migrationJob ?: synchronized(this) {
migrationJob ?: coroutineScope.async {
getTabsFromBackend(props)