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

[settingsDialog] Properly handle reopening settingsTab. Also fixes IJPL-177616

Browse Source 
GitOrigin-RevId: c46a609d6f849acab5ef1a71e90e5ee602a9daa4
This commit is contained in:
Sergey Pak
2025-03-07 20:07:33 +00:00
committed by intellij-monorepo-bot
parent 22a0a9de3e
commit 8aea6d1d40
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/newEditor/settings/SettingsVirtualFileHolder.kt
+10 -4
View File
@@ -63,9 +63,13 @@ internal class SettingsVirtualFileHolder private constructor(private val project
val settingsVirtualFile = settingsFileRef.get()
if (settingsVirtualFile != null) {
val editor = settingsVirtualFile.getOrCreateDialog().editor as? SettingsEditor
if (editor != null && toSelect != null) {
editor.select(toSelect)
val dialogIfCreated = settingsVirtualFile.getIfCreated()
if (dialogIfCreated != null) {
if (toSelect != null) {
(dialogIfCreated.editor as? SettingsEditor)?.select(toSelect)
}
} else {
settingsVirtualFile.initializer = initializer
}
return@withContext settingsVirtualFile
}
@@ -81,7 +85,7 @@ internal class SettingsVirtualFileHolder private constructor(private val project
return settingsFileRef.getAndSet(null)
}
class SettingsVirtualFile(val project: Project, private val initializer: () -> SettingsDialog) :
class SettingsVirtualFile(val project: Project, internal var initializer: () -> SettingsDialog) :
LightVirtualFile(CommonBundle.settingsTitle(), SettingsFileType, ""), OptionallyIncluded {
private val wasModified = AtomicBoolean()
@@ -138,6 +142,8 @@ internal class SettingsVirtualFileHolder private constructor(private val project
fun getOrCreateDialog(): SettingsDialog = dialogLazy.value
fun getIfCreated(): SettingsDialog? = dialogLazy.valueIfInitialized
fun isModified(): Boolean {
val dialog = dialogLazy.valueIfInitialized ?: return false
val settingsEditor = dialog.editor as? SettingsEditor ?: return false