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

[plugins] IJPL-248913 Restore serialized xml structure of PluginUpdateSourceId

Browse Source 
(cherry picked from commit 8312cd37453caba943ad82b0d2331f85da657f10)

GitOrigin-RevId: 1f9100a52386ef9064ec5b797029c92f5c2e772a
This commit is contained in:
Elena Shaverdova
2026-09-01 16:40:03 +00:00
committed by intellij-monorepo-bot
parent a2f4e7d926
commit c3735ee764
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateSourceServiceImpl.kt
+15 -10
View File
@@ -30,7 +30,7 @@ internal class PluginUpdateSourceServiceImpl : PluginUpdateSourceService,
}
val source = state.sources[pluginId.idString]
thisLogger().debug { "Requested pluginSourceId for $pluginId: $source" }
return source
return source?.toPluginSourceId()
}
override fun setPluginUpdateSourceId(pluginId: PluginId, updateSourceId: PluginUpdateSourceId) {
@@ -38,7 +38,7 @@ internal class PluginUpdateSourceServiceImpl : PluginUpdateSourceService,
return
}
thisLogger().info("Set PluginUpdateSourceId of $pluginId to $updateSourceId")
updateState({ copy(sources = state.sources + (pluginId.idString to updateSourceId.toRepository())) }) {
updateState({ copy(sources = state.sources + (pluginId.idString to updateSourceId.toXmlSerializableRepository())) }) {
"Plugin source for $pluginId is set to $updateSourceId"
}
}
@@ -93,20 +93,25 @@ internal class PluginUpdateSourceServiceImpl : PluginUpdateSourceService,
internal data class State(
@JvmField @XMap(propertyElementName = "sources", entryTagName = "entry", keyAttributeName = "pluginId")
val sources: Map<String, Repository> = emptyMap(),
val sources: Map<String, XmlSerializableRepository> = emptyMap(),
)
}
@Serializable
private data class Repository(
override val host: @NlsSafe String,
override val isMarketplace: Boolean,
) : PluginUpdateSourceId
@Tag("updateSource")
internal data class Repository(
internal data class XmlSerializableRepository(
@JvmField @Attribute("host") val hostToSerialize: @NlsSafe String,
@JvmField @Attribute("isMarketplace") val isMarketplaceToSerialize: Boolean,
) : PluginUpdateSourceId {
constructor() : this("", true)//for serialization
) {
@Suppress("unused")
constructor() : this("", true) //for serialization
override val host: @NlsSafe String get() = hostToSerialize
override val isMarketplace: Boolean get() = isMarketplaceToSerialize
fun toPluginSourceId(): PluginUpdateSourceId = Repository(hostToSerialize, isMarketplaceToSerialize)
}
internal fun createRepository(initialHost: String?): PluginUpdateSourceId {
@@ -120,6 +125,6 @@ internal fun createRepository(model: PluginUiModel): PluginUpdateSourceId {
return createRepository(model.repositoryName)
}
private fun PluginUpdateSourceId.toRepository(): Repository {
return Repository(host, isMarketplace)
private fun PluginUpdateSourceId.toXmlSerializableRepository(): XmlSerializableRepository {
return XmlSerializableRepository(host, isMarketplace)
}