Merge pull request #60 from Tbusk/patch/delegate

change: update parser to permit delegate declaration in namespace area

Author: Tbusk

CHANGELOG.md

@@ -3,15 +3,10 @@
 # vala-jetbrains-plugin Changelog
 ## [Unreleased]
 ### What's Changed
-- Adding semantic token colorization support from the language server.
-- Adding LSP4IJ configuration for code insight, spell checker, folding builder, psi structure viewer, and parameter
-  info.
-- Adding syntax highlighting for .in files.
-- Adding comment out and uncomment functionality.
-- Adding single, double quotation, and backtick escape functionality.
-- Updated plugin logo and added a different dark mode icon.
-- Updated source file icon to be more consistent with the JetBrains theme.
-- Implemented robust parser that can handle majority of Vala syntax.
+
+- Update parser to permit constants being declared in statements.
+- Update parser to no longer permit non-constant variables being declared in the namespace.
+- Update parser to allow delegate declaration in the namespace.
 
 ## [1.1.1-ALPHA]
 ### What's Changed

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.1.2-ALPHA
+pluginVersion=1.1.3-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/ValaLexer.java

@@ -129,7 +129,8 @@ public interface ValaTokenSets {
             ValaTypes.PREPROCESSOR_IF,
             ValaTypes.PREPROCESSOR_ELIF,
             ValaTypes.PREPROCESSOR_ELSE,
-            ValaTypes.PREPROCESSOR_ENDIF
+            ValaTypes.PREPROCESSOR_ENDIF,
+            ValaTypes.INLINE
     );
 
     Set<String> KEYWORDS_STRINGS = new HashSet<>(

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

@@ -109,6 +109,7 @@ namespace_member ::= [ attributes ]
                        enum_declaration |
                        errordomain_declaration |
                        method_declaration |
+                       delegate_declaration |
                        constant_declaration)
 
 attributes ::= attribute*

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

@@ -112,6 +112,7 @@ PREPROCESSOR_DIRECTIVE=("#if" | "#endif" | "#elif" | "#else") .* ("\r"|"\n"|"\r\
     "weak" {return ValaTypes.WEAK; }
     "extern" {return ValaTypes.EXTERN; }
     "delegate" {return ValaTypes.DELEGATE; }
+    "inline" {return ValaTypes.INLINE; }
 
     // Comments
     {DOC_COMMENT}      { return ValaTypes.DOC_COMMENT; }

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

@@ -0,0 +1,25 @@
+class DelegateClass {
+    delegate int Compare (string a, string b);
+
+    public delegate uint CompareOne (string a, string b);
+
+    private delegate string CompareTwo (string a, string b);
+
+    protected delegate char CompareThree (string a, string b);
+
+    async delegate uchar CompareFour (string a, string b);
+
+    class delegate uchar CompareFive (string a, string b);
+
+    extern delegate uchar CompareSix (string a, string b);
+
+    inline delegate uchar CompareSeven (string a, string b);
+
+    abstract delegate uchar CompareEight (string a, string b);
+
+    virtual delegate uchar CompareNine (string a, string b);
+
+    override delegate uchar CompareTen (string a, string b);
+
+    public async delegate uchar CompareEleven (string a, string b);
+}