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

FIXED IDEA-148591 Inheritance attribute in a color scheme is lost sometimes upon IDE window deactivation

Browse Source
This commit is contained in:
Rustam Vishnyakov
2015-11-27 16:29:27 +03:00
parent 55972c661e
commit be09ce6743
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
+9 -4
View File
@@ -346,11 +346,16 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme {
public void readAttributes(@NotNull Element childNode) {
for (Element e : childNode.getChildren(OPTION_ELEMENT)) {
TextAttributesKey name = TextAttributesKey.find(e.getAttributeValue(NAME_ATTR));
TextAttributesKey key = TextAttributesKey.find(e.getAttributeValue(NAME_ATTR));
String baseKeyName = e.getAttributeValue(BASE_ATTRIBUTES_ATTR);
if (baseKeyName != null) {
TextAttributesKey baseKey = TextAttributesKey.find(baseKeyName);
key.setFallbackAttributeKey(baseKey);
}
Element valueElement = e.getChild(VALUE_ELEMENT);
TextAttributes attr = myValueReader.read(TextAttributes.class, valueElement);
myAttributesMap.put(name, attr);
migrateErrorStripeColorFrom14(name, attr);
myAttributesMap.put(key, attr);
migrateErrorStripeColorFrom14(key, attr);
}
}
@@ -561,7 +566,7 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme {
TextAttributes defaultFallbackAttr =
baseKey != null && myParentScheme instanceof AbstractColorsScheme ?
((AbstractColorsScheme)myParentScheme).getFallbackAttributes(baseKey) : null;
TextAttributes value = myAttributesMap.get(key);
TextAttributes value = myAttributesMap.get(key);
Element element = new Element(OPTION_ELEMENT);
element.setAttribute(NAME_ATTR, key.getExternalName());
if (baseKey != null && value.isFallbackEnabled()) {