Add custom attribute highlighting

Darkyenus · Jul 27, 2016 · 61f7dbb · 61f7dbb
1 parent 3e248a8
commit 61f7dbb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -31,7 +31,7 @@
     <change-notes><![CDATA[
         <p>1.14</p>
         <ul>
-            <li>Allow custom highlighting for uniforms and varyings</li>
+            <li>Allow custom highlighting for uniforms, varyings and attributes</li>
         </ul>
 
         <p>1.13</p>

diff --git a/src/glslplugin/GLSLColorAndFontsPage.java b/src/glslplugin/GLSLColorAndFontsPage.java
@@ -53,6 +53,7 @@ public class GLSLColorAndFontsPage implements ColorSettingsPage {
             new AttributesDescriptor("Identifiers",GLSLHighlighter.GLSL_IDENTIFIER[0]),
             new AttributesDescriptor("Identifiers of Uniforms",GLSLHighlighter.GLSL_IDENTIFIER_UNIFORM[0]),
             new AttributesDescriptor("Identifiers of Varyings",GLSLHighlighter.GLSL_IDENTIFIER_VARYING[0]),
+            new AttributesDescriptor("Identifiers of Attributes",GLSLHighlighter.GLSL_IDENTIFIER_ATTRIBUTE[0]),
             new AttributesDescriptor("Text",GLSLHighlighter.GLSL_TEXT[0]),
             new AttributesDescriptor("Directives",GLSLHighlighter.GLSL_PREPROCESSOR_DIRECTIVE[0])
         };

diff --git a/src/glslplugin/GLSLHighlighter.java b/src/glslplugin/GLSLHighlighter.java
@@ -63,6 +63,8 @@ public class GLSLHighlighter extends SyntaxHighlighterBase {
             { TextAttributesKey.createTextAttributesKey("GLSL.IDENTIFIER.UNIFORM", GLSL_IDENTIFIER[0]) };
     public static final TextAttributesKey[] GLSL_IDENTIFIER_VARYING =
             { TextAttributesKey.createTextAttributesKey("GLSL.IDENTIFIER.VARYING", GLSL_IDENTIFIER[0]) };
+    public static final TextAttributesKey[] GLSL_IDENTIFIER_ATTRIBUTE =
+            { TextAttributesKey.createTextAttributesKey("GLSL.IDENTIFIER.ATTRIBUTE", GLSL_IDENTIFIER[0]) };
     static final TextAttributesKey[] GLSL_PREPROCESSOR_DIRECTIVE =
             { TextAttributesKey.createTextAttributesKey("GLSL.PREPROCESSOR_DIRECTIVE", DefaultLanguageHighlighterColors.METADATA) };
     public static final TextAttributesKey[] GLSL_REDEFINED_TOKEN =

diff --git a/src/glslplugin/annotation/impl/VariableTypeHighlightAnnotation.java b/src/glslplugin/annotation/impl/VariableTypeHighlightAnnotation.java
@@ -28,6 +28,9 @@ public void annotate(GLSLIdentifierExpression expr, AnnotationHolder holder) {
         } else if (qualifiedType.hasQualifier(GLSLQualifier.Qualifier.VARYING)) {
             Annotation annotation = holder.createAnnotation(HighlightSeverity.INFORMATION, expr.getTextRange(), null);
             annotation.setTextAttributes(GLSLHighlighter.GLSL_IDENTIFIER_VARYING[0]);
+        } else if (qualifiedType.hasQualifier(GLSLQualifier.Qualifier.ATTRIBUTE)) {
+            Annotation annotation = holder.createAnnotation(HighlightSeverity.INFORMATION, expr.getTextRange(), null);
+            annotation.setTextAttributes(GLSLHighlighter.GLSL_IDENTIFIER_ATTRIBUTE[0]);
         }
     }