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

EA-30144 fixed

Browse Source
This commit is contained in:
Roman Chernyatchik
2011-10-11 20:40:06 +04:00
parent ef3e21145d
commit 51402bdbeb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+9 -1
View File
@@ -71,6 +71,7 @@ public class HighlightInfo implements Segment {
return severity;
}
@Nullable
public TextAttributes getTextAttributes(final PsiElement element,
@Nullable final EditorColorsScheme editorColorsScheme) {
if (forcedTextAttributes != null) {
@@ -78,6 +79,10 @@ public class HighlightInfo implements Segment {
}
final EditorColorsScheme colorsScheme = getColorsScheme(editorColorsScheme);
if (colorsScheme == null) {
return null;
}
if (forcedTextAttributesKey != null) {
return colorsScheme.getAttributes(forcedTextAttributesKey);
}
@@ -104,6 +109,9 @@ public class HighlightInfo implements Segment {
return forcedTextAttributes.getErrorStripeColor();
}
final EditorColorsScheme scheme = getColorsScheme(colorsScheme);
if (scheme == null) {
return null;
}
if (forcedTextAttributesKey != null) {
final Color errorStripeColor = scheme.getAttributes(forcedTextAttributesKey).getErrorStripeColor();
// let's copy above behaviour of forcedTextAttributes stripe color, but I'm not sure that the behaviour is correct in general
@@ -133,7 +141,7 @@ public class HighlightInfo implements Segment {
}
@NotNull
@Nullable
private static EditorColorsScheme getColorsScheme(@Nullable final EditorColorsScheme customScheme) {
if (customScheme != null) {
return customScheme;