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

Let default attributes have a bigger priority if defined

Browse Source
This commit is contained in:
Rustam Vishnyakov
2013-01-16 12:37:28 +04:00
parent 24b49c1a06
commit 1d3d3b28a2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java
+4 -4
View File
@@ -109,11 +109,11 @@ public final class TextAttributesKey implements Comparable<TextAttributesKey>, J
* @return the text attributes.
*/
public TextAttributes getDefaultAttributes() {
if (myFallbackAttributeKey != null) {
TextAttributes fallbackAttributes = myFallbackAttributeKey.getDefaultAttributes();
if (fallbackAttributes != null && !fallbackAttributes.isEmpty()) return fallbackAttributes;
}
if (myDefaultAttributes == NULL_ATTRIBUTES) {
if (myFallbackAttributeKey != null) {
TextAttributes fallbackAttributes = myFallbackAttributeKey.getDefaultAttributes();
if (fallbackAttributes != null && !fallbackAttributes.isEmpty()) return fallbackAttributes;
}
// E.g. if one text key reuse default attributes of some other predefined key
myDefaultAttributes = null;
final TextAttributeKeyDefaultsProvider provider = ourDefaultsProvider.getValue();
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/DefaultColorsScheme.java
-3
View File
@@ -43,10 +43,7 @@ public class DefaultColorsScheme extends AbstractColorsScheme implements ReadOnl
if (key == null) return null;
TextAttributes attrs = myAttributesMap.get(key);
if (attrs == null) {
attrs = getFallbackAttributes(key.getFallbackAttributeKey());
if (attrs == null) {
attrs = key.getDefaultAttributes();
}
}
return attrs;
}