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-134482 - NPE: NodeRendererSettings$DescriptorUpdater.wrapIfNeeded

Browse Source
This commit is contained in:
Egor Ushakov
2019-01-21 17:53:34 +03:00
parent aa2fc7bbfb
commit 00041425b8
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+10 -8
View File
@@ -563,9 +563,9 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
}
static String constructLabelText(String keylabel,
ValueDescriptorImpl keyDescriptor,
@Nullable ValueDescriptorImpl keyDescriptor,
String valueLabel,
ValueDescriptorImpl valueDescriptor) {
@Nullable ValueDescriptorImpl valueDescriptor) {
StringBuilder sb = new StringBuilder();
sb.append(wrapIfNeeded(keylabel, keyDescriptor));
sb.append(" -> ");
@@ -575,12 +575,14 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
return sb.toString();
}
private static String wrapIfNeeded(String label, ValueDescriptorImpl descriptor) {
Renderer lastRenderer = descriptor.getLastRenderer();
if (descriptor.isString() ||
lastRenderer instanceof ToStringRenderer ||
(lastRenderer instanceof CompoundTypeRenderer && !(lastRenderer instanceof UnboxableTypeRenderer))) {
label = StringUtil.wrapWithDoubleQuote(label);
private static String wrapIfNeeded(String label, @Nullable ValueDescriptorImpl descriptor) {
if (descriptor != null) {
Renderer lastRenderer = descriptor.getLastRenderer();
if (descriptor.isString() ||
lastRenderer instanceof ToStringRenderer ||
(lastRenderer instanceof CompoundTypeRenderer && !(lastRenderer instanceof UnboxableTypeRenderer))) {
label = StringUtil.wrapWithDoubleQuote(label);
}
}
return label;
}