From b5e22d8fbefdcbf29c58363b35a8a90580457497 Mon Sep 17 00:00:00 2001 From: Justin Tennant Date: Tue, 14 Jul 2020 01:35:06 -0700 Subject: [PATCH] Version 0.3.2 + metadata/dict icon updates --- build.gradle | 2 +- .../usdidea/lang/psi/impl/USDPsiImplUtil.java | 17 +++++++++--- src/main/resources/META-INF/change-notes.html | 27 +++++++------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 8695576..1169b50 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.justint' -version '0.3.1' +version '0.3.2' sourceSets.main.java.srcDirs = ['src/main/gen','src/main/java'] diff --git a/src/main/java/com/justint/usdidea/lang/psi/impl/USDPsiImplUtil.java b/src/main/java/com/justint/usdidea/lang/psi/impl/USDPsiImplUtil.java index 2a7ee9c..115ce27 100644 --- a/src/main/java/com/justint/usdidea/lang/psi/impl/USDPsiImplUtil.java +++ b/src/main/java/com/justint/usdidea/lang/psi/impl/USDPsiImplUtil.java @@ -4,6 +4,7 @@ import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; import com.intellij.psi.tree.IElementType; +import com.intellij.ui.IconManager; import com.intellij.util.PlatformIcons; import com.justint.usdidea.lang.psi.*; import org.jetbrains.annotations.NotNull; @@ -117,9 +118,9 @@ public String getLocationString() { @Override public Icon getIcon(boolean b) { if (dictItemElement.isDictionary()) { - return AllIcons.Json.Object; + return IconManager.getInstance().createLayered(AllIcons.Json.Object, AllIcons.Nodes.StaticMark); } - return PlatformIcons.PROPERTY_ICON; + return IconManager.getInstance().createLayered(PlatformIcons.PROPERTY_ICON, AllIcons.Nodes.StaticMark); } }; } @@ -127,6 +128,14 @@ public Icon getIcon(boolean b) { @NotNull public static ItemPresentation getPresentation(final usdMetadatum metadatumElement) { return new ItemPresentation() { + + // This works, but isn't neccessary - I think we can stick with layered/row icons for now +// public TextAttributesKey getTextAttributesKey() { +// TextAttributes attributes = DefaultLanguageHighlighterColors.IDENTIFIER.getDefaultAttributes().clone(); +// attributes.setFontType(Font.ITALIC); +// return TextAttributesKey.createTextAttributesKey("USD_METADATA_KEY", attributes); +// } + @Nullable @Override public String getPresentableText() { @@ -148,8 +157,8 @@ public String getLocationString() { @Override public Icon getIcon(boolean b) { if (metadatumElement.isDictionary()) { - return AllIcons.Json.Object; - } else return PlatformIcons.METHOD_ICON; + return IconManager.getInstance().createLayered(AllIcons.Json.Object, AllIcons.Nodes.StaticMark); + } else return IconManager.getInstance().createLayered(PlatformIcons.METHOD_ICON, AllIcons.Nodes.StaticMark); } }; } diff --git a/src/main/resources/META-INF/change-notes.html b/src/main/resources/META-INF/change-notes.html index 174189d..47c09ee 100644 --- a/src/main/resources/META-INF/change-notes.html +++ b/src/main/resources/META-INF/change-notes.html @@ -1,25 +1,16 @@ -Version 0.3.1: +Version 0.3.2: -Version 0.3: - \ No newline at end of file