From f71969671568c07486d27fc7e04577e09f59730e Mon Sep 17 00:00:00 2001 From: Valentin Fondaratov Date: Mon, 4 Jul 2016 12:37:34 +0300 Subject: [PATCH] change YAMLKeyValue icon retrieval This will help delegate to KV's icon easier as well as preserve an ability to overload it in IconProvider --- .../src/org/jetbrains/yaml/psi/impl/YAMLKeyValueImpl.java | 8 +++++++- .../yaml/structureView/YAMLStructureViewElement.java | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLKeyValueImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLKeyValueImpl.java index 6c1e0737cc5b..020b0ae9c980 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLKeyValueImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLKeyValueImpl.java @@ -138,6 +138,12 @@ public class YAMLKeyValueImpl extends YAMLPsiElementImpl implements YAMLKeyValue } } + @NotNull + @Override + protected Icon getElementIcon(@IconFlags int flags) { + return PlatformIcons.PROPERTY_ICON; + } + @Override public ItemPresentation getPresentation() { final YAMLFile yamlFile = (YAMLFile)getContainingFile(); @@ -155,7 +161,7 @@ public class YAMLKeyValueImpl extends YAMLPsiElementImpl implements YAMLKeyValue } public Icon getIcon(boolean open) { - return PlatformIcons.PROPERTY_ICON; + return YAMLKeyValueImpl.this.getIcon(0); } }; } diff --git a/plugins/yaml/src/org/jetbrains/yaml/structureView/YAMLStructureViewElement.java b/plugins/yaml/src/org/jetbrains/yaml/structureView/YAMLStructureViewElement.java index ee690a525bbf..46678f2d2706 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/structureView/YAMLStructureViewElement.java +++ b/plugins/yaml/src/org/jetbrains/yaml/structureView/YAMLStructureViewElement.java @@ -2,7 +2,6 @@ package org.jetbrains.yaml.structureView; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.navigation.ItemPresentation; -import com.intellij.psi.PsiElement; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -82,8 +81,8 @@ public class YAMLStructureViewElement implements StructureViewTreeElement { } public Icon getIcon(boolean open) { - final PsiElement value = kv.getValue(); - return value instanceof YAMLScalar ? PlatformIcons.PROPERTY_ICON : PlatformIcons.XML_TAG_ICON; + final YAMLValue value = kv.getValue(); + return value instanceof YAMLScalar ? kv.getIcon(0) : PlatformIcons.XML_TAG_ICON; } }; }