Improve syntax highlighting with new USDHighlighterLexer

justint · May 24, 2019 · 63b504e · 63b504e
1 parent 8f136e1
commit 63b504e
Show file tree

Hide file tree

Showing 19 changed files with 2,790 additions and 633 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,7 @@
 .idea/
 out/
-#gen/
 build/
 .gradle/
 jflex/
 .DS_Store
 Thumbs.db
-src/test/
-testData/
diff --git a/src/main/gen/com/justint/usdidea/lang/lexer/USDHighlighterLexer.java b/src/main/gen/com/justint/usdidea/lang/lexer/USDHighlighterLexer.java
diff --git a/src/main/gen/com/justint/usdidea/lang/lexer/USDLexer.java b/src/main/gen/com/justint/usdidea/lang/lexer/USDLexer.java
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/usdMetadataKeyImpl.java b/src/main/gen/com/justint/usdidea/lang/psi/impl/usdMetadataKeyImpl.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/impl/usdPrimSpecImpl.java b/src/main/gen/com/justint/usdidea/lang/psi/impl/usdPrimSpecImpl.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/impl/usdSpecialMetadataKeyImpl.java b/src/main/gen/com/justint/usdidea/lang/psi/impl/usdSpecialMetadataKeyImpl.java
diff --git a/src/main/gen/com/justint/usdidea/lang/psi/usdMetadataKey.java b/src/main/gen/com/justint/usdidea/lang/psi/usdMetadataKey.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/usdSpecialMetadataKey.java b/src/main/gen/com/justint/usdidea/lang/psi/usdSpecialMetadataKey.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/highlighting/USDSyntaxHighlighter.java b/src/main/java/com/justint/usdidea/codeinsight/highlighting/USDSyntaxHighlighter.java
@@ -6,6 +6,7 @@
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.containers.ContainerUtil;
+import com.justint.usdidea.lang.lexer.USDHighlighterLexerAdapter;
 import com.justint.usdidea.lang.lexer.USDLexerAdapter;
 import com.justint.usdidea.lang.parser.USDParserDefinition;
 import org.jetbrains.annotations.NotNull;
@@ -27,61 +28,28 @@ public class USDSyntaxHighlighter extends SyntaxHighlighterBase {
     public static final TextAttributesKey COMMENT =
             createTextAttributesKey("COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT);
 
-//
-//    // TextAttributesKey arrays
-//    private static final TextAttributesKey[] CONSTANTS = new TextAttributesKey[] {USD_DECLARATION};
-//    private static final TextAttributesKey[] IDENTIFIERS = new TextAttributesKey[]{
-//            createTextAttributesKey("ALPHA", DefaultLanguageHighlighterColors.IDENTIFIER)
-//    };
-//    private static final TextAttributesKey[] INSTANCE_FIELDS = new TextAttributesKey[]{
-//            createTextAttributesKey("ATTRIBUTE_NAME", DefaultLanguageHighlighterColors.INSTANCE_FIELD),
-//            createTextAttributesKey("PRIM_NAME", DefaultLanguageHighlighterColors.INSTANCE_FIELD)
-//    };
-//    private static final TextAttributesKey[] KEYWORDS = new TextAttributesKey[]{
-//            createTextAttributesKey("ADD", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("ALPHA", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("APPEND", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("CLASS", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("DEF", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("DELETE", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("OVER", DefaultLanguageHighlighterColors.KEYWORD),
-//            createTextAttributesKey("PREPEND", DefaultLanguageHighlighterColors.KEYWORD),
-//
-//    };
-//    private static final TextAttributesKey[] BAD_CHAR_KEYS = new TextAttributesKey[]{BAD_CHARACTER};
-//    private static final TextAttributesKey[] COMMENT_KEYS = new TextAttributesKey[]{COMMENT};
-//    private static final TextAttributesKey[] EMPTY_KEYS = new TextAttributesKey[0];
-//
-//    private static final IElementType[] USD_KEYWORDS = {
-//            USDTypes.ADD,
-//            USDTypes.ALPHA,
-//            USDTypes.APPEND,
-//            USDTypes.CLASS,
-//            USDTypes.DEF,
-//            USDTypes.DELETE,
-//            USDTypes.OVER,
-//            USDTypes.PREPEND
-//    };
-
     private static final Map<IElementType, TextAttributesKey> ATTRIBUTES = ContainerUtil.newHashMap();
 
     static {
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.USDDECLARATION, DefaultLanguageHighlighterColors.CONSTANT);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.BRACKETS, DefaultLanguageHighlighterColors.BRACKETS);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.KEYWORDS, DefaultLanguageHighlighterColors.KEYWORD);
+        SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.SPECIAL_KEYWORDS, DefaultLanguageHighlighterColors.STATIC_FIELD);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.STRINGS, DefaultLanguageHighlighterColors.STRING);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.NUMBERS, DefaultLanguageHighlighterColors.NUMBER);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.LINE_COMMENTS, DefaultLanguageHighlighterColors.LINE_COMMENT);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.BLOCK_COMMENTS, DefaultLanguageHighlighterColors.BLOCK_COMMENT);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.IDENTIFIERS, DefaultLanguageHighlighterColors.IDENTIFIER);
+        SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.PRIM_NAMES, DefaultLanguageHighlighterColors.FUNCTION_DECLARATION);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.ASSETREFERENCES, USDHighlighterColors.ASSETREFERENCE_KEY);
         SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.PATHREFERENCES, USDHighlighterColors.PATHREFERENCE_KEY);
+        SyntaxHighlighterBase.fillMap(ATTRIBUTES, USDParserDefinition.METADATA_KEYS, DefaultLanguageHighlighterColors.INSTANCE_FIELD);
     }
 
     @NotNull
     @Override
     public Lexer getHighlightingLexer() {
-        return new USDLexerAdapter();
+        return new USDHighlighterLexerAdapter();
     }
 
     @NotNull

diff --git a/src/main/java/com/justint/usdidea/lang/USD.bnf b/src/main/java/com/justint/usdidea/lang/USD.bnf
@@ -7,6 +7,7 @@
     psiImplClassSuffix="Impl"
     psiPackage="com.justint.usdidea.lang.psi"
     psiImplPackage="com.justint.usdidea.lang.psi.impl"
+    psiImplUtilClass="com.justint.usdidea.lang.psi.impl.USDPsiImplUtil"
 
     elementTypeHolderClass="com.justint.usdidea.lang.psi.USDTypes"
     elementTypeClass="com.justint.usdidea.lang.psi.USDElementType"
@@ -173,7 +174,7 @@ Identifier ::= alpha (alpha | number)*
 NamespacedIdentifier ::= Identifier (colon Identifier)+
 
 
-PrimSpec ::= Specifier Metadata? Body
+PrimSpec ::= Specifier Metadata? Body {methods=[getPrimName getPrimType getName getPresentation]}
 
 Specifier ::= def [Typename] PrimName | over PrimName | class [Typename] PrimName
 
@@ -218,7 +219,9 @@ Metadata ::= leftparens (!rightparens ( MetadataComment | [ListEditAction? Metad
 ListEditAction ::= add | append | prepend | delete
 
 
-MetadataKey ::= Identifier | CompositionArc | doc | variantSet | kind | variants
+MetadataKey ::= Identifier | CompositionArc | SpecialMetadataKey
+
+SpecialMetadataKey ::= doc | variantSet | kind | variants
 
 MetadataValue ::= Item