Merge pull request #70 from Tbusk/patch/attributes

patch: update parser for attributes to handle more complex usages

Author: Tbusk

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -38,7 +38,8 @@ body:
       label: Version
       description: What version of the plugin are you using?
       options:
-        - Latest
+        - Latest (if not added)
+        - 1.2.1-ALPHA
         - 1.2.0-ALPHA
         - 1.1.3-ALPHA
         - 1.1.2-ALPHA

CHANGELOG.md

@@ -6,6 +6,14 @@
 
 ### What's Changed
 
+- Added keyword highlighting for delegate
+- Patched indentation for errordomain and attribute pairing.
+- Updated parser to permit multiple identifiers / arguments rather than
+  a single one per attribute
+
+## [1.2.0-ALPHA]
+
+### What's Changed
 - Added new Vala project wizard to Java-based IDEs
 - Added new Vala project wizard with Meson to Java-based IDEs
 - Added new Vala project wizard to non-Java-based IDEs

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.tbusk.vala_plugin
 pluginName = Vala Language
 pluginRepositoryUrl = https://github.com/Tbusk/vala-jetbrains-plugin
 # SemVer format -> https://semver.org
-pluginVersion=1.2.0-ALPHA
+pluginVersion=1.2.1-ALPHA
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 251

src/main/gen/com/tbusk/vala_plugin/ValaParser.java

@@ -125,6 +125,7 @@ public interface ValaTokenSets {
             ValaTypes.PREPROCESSOR_ELIF,
             ValaTypes.PREPROCESSOR_ELSE,
             ValaTypes.PREPROCESSOR_ENDIF,
-            ValaTypes.INLINE
+            ValaTypes.INLINE,
+            ValaTypes.DELEGATE
     );
 }

src/main/gen/com/tbusk/vala_plugin/psi/ValaAttribute.java

@@ -96,6 +96,13 @@ private Indent calculateChildIndent(ASTNode child) {
         IElementType parentType = myNode.getElementType();
         IElementType childType = child.getElementType();
 
+        if ((parentType == ValaTypes.CLASS_MEMBER ||
+                parentType == ValaTypes.NAMESPACE_MEMBER ||
+                parentType == ValaTypes.INTERFACE_MEMBER ||
+                parentType == ValaTypes.STRUCT_MEMBER) && (myNode.findChildByType(ValaTypes.ATTRIBUTES) != null || myNode.findChildByType(ValaTypes.ATTRIBUTE) != null)) {
+            return Indent.getNoneIndent();
+        }
+
         if (parentType == ValaTypes.PREPROCESSOR_DIRECTIVE || childType == ValaTypes.PREPROCESSOR_DIRECTIVE) {
             return Indent.getAbsoluteNoneIndent();
         }
@@ -108,7 +115,7 @@ private Indent calculateChildIndent(ASTNode child) {
             return Indent.getNormalIndent();
         }
 
-        if (parentType == ValaTypes.ERRORDOMAIN_DECLARATION && (childType != ValaTypes.SEMICOLON && childType != ValaTypes.RBRACE)) {
+        if (parentType == ValaTypes.ERRORDOMAIN_DECLARATION && (childType == ValaTypes.ERRORCODES || childType == ValaTypes.METHOD_DECLARATION)) {
             return Indent.getNormalIndent();
         }
 
@@ -128,10 +135,6 @@ private Indent calculateChildIndent(ASTNode child) {
             return Indent.getNormalIndent();
         }
 
-        if ((parentType == ValaTypes.CLASS_MEMBER || parentType == ValaTypes.NAMESPACE_MEMBER || parentType == ValaTypes.INTERFACE_MEMBER) && myNode.findChildByType(ValaTypes.ATTRIBUTES) != null) {
-            return Indent.getNoneIndent();
-        }
-
         if (parentType == ValaTypes.ENUM_DECLARATION &&
                 (
                         childType == ValaTypes.METHOD_DECLARATION ||

src/main/gen/com/tbusk/vala_plugin/psi/impl/ValaAttributeImpl.java

@@ -114,7 +114,7 @@ namespace_member ::= [ attributes ]
 
 attributes ::= attribute*
 
-attribute ::= LBRACKET IDENTIFIER [ attribute_arguments ] RBRACKET
+attribute ::= LBRACKET IDENTIFIER [ attribute_arguments ] [ (COMMA IDENTIFIER [ attribute_arguments ])* ] RBRACKET
 
 attribute_arguments ::= LPAREN attribute_argument [ (COMMA attribute_argument)* ] RPAREN
 

src/main/java/com/tbusk/vala_plugin/ValaTokenSets.java

@@ -0,0 +1,40 @@
+[Flags, CCode (cname = "int", cprefix = "SDL_INIT_", has_type_id = false)]
+public enum InitFlags {
+    AUDIO,
+    VIDEO,
+    JOYSTICK,
+    HAPTIC,
+    GAMEPAD,
+    EVENTS,
+    SENSOR,
+    CAMERA
+}
+
+[Diagnostics, SimpleType, CCode (cname = "cname_property", has_type_id = false)]
+public class BeforeNamespaceAttributeClass {
+
+}
+
+[CCode (cname = "cname_property", has_type_id = false), Diagnostics, SimpleType]
+public struct PropertiesID : uint32 {}
+
+[Diagnostics, CCode (cname = "cname_property", has_type_id = false), SimpleType]
+public virtual delegate uint TestDelegate ();
+
+[Diagnostics, PrintfFormat]
+public errordomain decl {
+    ERROR;
+}
+
+[Diagnostics, PrintfFormat]
+const uint CONSTANT = 1;
+
+[SimpleType, CCode (cname = "SDL_PropertiesID", has_type_id = false)]
+public uint get_enums () {
+    return 1u;
+}
+
+[SimpleType, CCode (cname = "SDL_PropertiesID", has_type_id = false)]
+public interface TestInterface {
+
+}