#57: Added ability to distinguish between variables and fields for be…

…tter colourisation support in Intellij plugin
jaccomoc · Oct 5, 2024 · a8dec6b · a8dec6b
1 parent aa65e2e
commit a8dec6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/io/jactl/JactlName.java b/src/main/java/io/jactl/JactlName.java
@@ -27,7 +27,7 @@ public class JactlName extends JactlUserDataHolder {
   private NameType type;
 
   public enum NameType {
-    FILE, PACKAGE, CLASS, FUNCTION, METHOD, VARIABLE, PARAMETER
+    FILE, PACKAGE, CLASS, FUNCTION, METHOD, FIELD, VARIABLE, PARAMETER
   }
 
   public JactlName(Token name, NameType type) {

diff --git a/src/main/java/io/jactl/Parser.java b/src/main/java/io/jactl/Parser.java
@@ -797,7 +797,7 @@ private Stmt.VarDecl singleVarDecl(JactlType type, boolean inClassDecl, boolean
       else {
         return advance();
       }
-    }, isParameter ? JactlName.NameType.PARAMETER : JactlName.NameType.VARIABLE);
+    }, isParameter ? JactlName.NameType.PARAMETER : inClassDecl ? JactlName.NameType.FIELD : JactlName.NameType.VARIABLE);
     Expr  initialiser = null;
     Token equalsToken = null;
     if (matchAny(EQUAL)) {