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-78416 - NPE: ResourceBundlePropertyStructureViewElement$.getTextAttributes

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-01-28 18:01:21 +03:00
parent 3d9430ae8b
commit 16dc890fce
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java
+5 -3
View File
@@ -127,9 +127,11 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView
if (getProperty().getPsiElement().isValid()) {
myInspectionPassInfo =
ResourceBundleEditorInspectionPass.inspect(getProperty().getKey(), getProperty().getPropertiesFile().getResourceBundle());
TextAttributes highlightingAttributes = myInspectionPassInfo.getTextAttributes(colorsScheme);
if (highlightingAttributes != null) {
return TextAttributes.merge(baseAttrs, highlightingAttributes);
if (myInspectionPassInfo != null) {
TextAttributes highlightingAttributes = myInspectionPassInfo.getTextAttributes(colorsScheme);
if (highlightingAttributes != null) {
return TextAttributes.merge(baseAttrs, highlightingAttributes);
}
}
}
return baseAttrs;