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

fixup! IJPL-13064 Don't apply an incompatible color scheme during settings sync

Browse Source 
GitOrigin-RevId: d784506891173a64ae9a0fbe9297dffc4dae63c4
This commit is contained in:
Sergey Pak
2024-07-10 15:30:54 +00:00
committed by intellij-monorepo-bot
parent d76ca94247
commit bf571336d4
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt
+26 -10
View File
@@ -379,7 +379,17 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
override fun getActiveVisibleScheme(): EditorColorsScheme? {
val scheme = schemeManager.activeScheme
if (scheme is AbstractColorsScheme && !scheme.isReadOnly && !scheme.isVisible) {
return scheme.parentScheme
return when (val parentScheme = scheme.parentScheme) {
null -> {
LOG.error("Parent scheme for '${scheme.name}' is null!")
null
}
is DefaultColorsScheme -> getScheme(parentScheme.editableCopyName)
else -> {
LOG.error("Color scheme '${parentScheme.name}' is not a DefaultColorsScheme!")
null
}
}
}
return scheme?.let { getEditableCopy(it) } ?: scheme
}
@@ -525,10 +535,12 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
private inner class EditorColorSchemeProcessor(
private val additionalTextAttributes: MutableMap<String, MutableList<AdditionalTextAttributesEP>>,
) : LazySchemeProcessor<EditorColorsScheme, EditorColorsSchemeImpl>(), SchemeExtensionProvider {
override fun createScheme(dataHolder: SchemeDataHolder<EditorColorsSchemeImpl>,
name: String,
attributeProvider: (String) -> String?,
isBundled: Boolean): EditorColorsSchemeImpl {
override fun createScheme(
dataHolder: SchemeDataHolder<EditorColorsSchemeImpl>,
name: String,
attributeProvider: (String) -> String?,
isBundled: Boolean,
): EditorColorsSchemeImpl {
// do we have BundledEditorColorScheme here?
val scheme = if (isBundled) BundledEditorColorScheme(name) else EditorColorsSchemeImpl(null)
// todo be lazy
@@ -554,9 +566,11 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
return if (scheme.isReadOnly) SchemeState.NON_PERSISTENT else SchemeState.POSSIBLY_CHANGED
}
override fun onCurrentSchemeSwitched(oldScheme: EditorColorsScheme?,
newScheme: EditorColorsScheme?,
processChangeSynchronously: Boolean) {
override fun onCurrentSchemeSwitched(
oldScheme: EditorColorsScheme?,
newScheme: EditorColorsScheme?,
processChangeSynchronously: Boolean,
) {
// the method receives the base scheme as the argument, but the actual scheme might be different
val actualNewScheme = if (schemeManager.activeScheme == newScheme) {
activeVisibleScheme
@@ -770,8 +784,10 @@ fun readEditorSchemeNameFromXml(parser: XMLStreamReader): String? {
private val BUNDLED_EP_NAME = ExtensionPointName<BundledSchemeEP>("com.intellij.bundledColorScheme")
@VisibleForTesting
fun createLoadBundledSchemeRequests(additionalTextAttributes: MutableMap<String, MutableList<AdditionalTextAttributesEP>>,
checkId: Boolean = false)
fun createLoadBundledSchemeRequests(
additionalTextAttributes: MutableMap<String, MutableList<AdditionalTextAttributesEP>>,
checkId: Boolean = false,
)
: Sequence<SchemeManager.LoadBundleSchemeRequest<EditorColorsScheme>> {
return sequence {
for (item in BUNDLED_EP_NAME.filterableLazySequence()) {