Towards #12: Add support for metadata + dictionaries in Structure View

justint · Jun 27, 2020 · 1cd87ef · 1cd87ef
1 parent 00492ac
commit 1cd87ef
Show file tree

Hide file tree

Showing 16 changed files with 364 additions and 66 deletions.
diff --git a/src/main/gen/com/justint/usdidea/lang/parser/USDParser.java b/src/main/gen/com/justint/usdidea/lang/parser/USDParser.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/USDTypes.java b/src/main/gen/com/justint/usdidea/lang/psi/USDTypes.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/impl/usdDictImpl.java b/src/main/gen/com/justint/usdidea/lang/psi/impl/usdDictImpl.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/impl/usdDictItemImpl.java b/src/main/gen/com/justint/usdidea/lang/psi/impl/usdDictItemImpl.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/impl/usdMetadatumImpl.java b/src/main/gen/com/justint/usdidea/lang/psi/impl/usdMetadatumImpl.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/usdDict.java b/src/main/gen/com/justint/usdidea/lang/psi/usdDict.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/usdDictItem.java b/src/main/gen/com/justint/usdidea/lang/psi/usdDictItem.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/usdMetadatum.java b/src/main/gen/com/justint/usdidea/lang/psi/usdMetadatum.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/usdPrimSpec.java b/src/main/gen/com/justint/usdidea/lang/psi/usdPrimSpec.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/usdVisitor.java b/src/main/gen/com/justint/usdidea/lang/psi/usdVisitor.java
diff --git a/src/main/java/com/justint/usdidea/codeinsight/USDBreadcrumbsProvider.java b/src/main/java/com/justint/usdidea/codeinsight/USDBreadcrumbsProvider.java
@@ -4,7 +4,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.breadcrumbs.BreadcrumbsProvider;
 import com.justint.usdidea.lang.USDLanguage;
-import com.justint.usdidea.lang.psi.impl.usdPrimSpecImpl;
+import com.justint.usdidea.lang.psi.USDBreadcrumbItem;
 import org.jetbrains.annotations.NotNull;
 
 public class USDBreadcrumbsProvider implements BreadcrumbsProvider {
@@ -16,15 +16,12 @@ public Language[] getLanguages() {
 
     @Override
     public boolean acceptElement(@NotNull PsiElement psiElement) {
-        return psiElement instanceof usdPrimSpecImpl;
+        return (psiElement instanceof USDBreadcrumbItem);
     }
 
     @NotNull
     @Override
     public String getElementInfo(@NotNull PsiElement psiElement) {
-        if (psiElement instanceof usdPrimSpecImpl) {
-            return ((usdPrimSpecImpl) psiElement).getName();
-        }
-        else return "";
+        return ((USDBreadcrumbItem)psiElement).getName();
     }
 }
diff --git a/src/main/java/com/justint/usdidea/lang/USD.bnf b/src/main/java/com/justint/usdidea/lang/USD.bnf
@@ -2,6 +2,7 @@
     parserClass="com.justint.usdidea.lang.parser.USDParser"
 
     extends="com.intellij.extapi.psi.ASTWrapperPsiElement"
+    implements("DictItem|PrimSpec")="com.justint.usdidea.lang.psi.USDBreadcrumbItem"
 
     psiClassPrefix="usd"
     psiImplClassSuffix="Impl"
@@ -224,7 +225,7 @@ AttributeValue ::= Item
 
 Metadata ::= leftparens (!rightparens [MetadataComment | Metadatum])* rightparens
 
-Metadatum ::= ListEditAction? MetadataKey equals MetadataValue {pin=2 recoverWhile=Metadatum_recover}
+Metadatum ::= ListEditAction? MetadataKey equals MetadataValue {methods=[getName isDictionary getPresentation] pin=2 recoverWhile=Metadatum_recover}
 private Metadatum_recover ::= !(rightparens | ListEditAction | MetadataKey )
 
 ListEditAction ::= add | append | prepend | delete | reorder
@@ -249,7 +250,9 @@ Item ::= InterpolatedArray | Array | Vector | string | number | floatnumber | Re
 
 ReferenceItem ::= assetReference pathReference | assetReference | pathReference
 
-Dict ::= leftbrace [!rightbrace DictKey equals DictValue (DictKey equals DictValue)*] rightbrace | leftbrace rightbrace
+Dict ::= leftbrace [!rightbrace DictItem (DictItem)*] rightbrace | leftbrace rightbrace
+
+DictItem ::= DictKey equals DictValue {methods=[getName getType isDictionary getPresentation]}
 
 DictKey ::= AttributeType (Identifier | string)