Fix hover hint for getter fields

Signed-off-by: Ben Sherman <[email protected]>
nextflow-io · Nov 23, 2024 · 390a0c0 · 390a0c0
1 parent f80cc91
commit 390a0c0
Showing 1 changed file with 27 additions and 3 deletions.
diff --git a/modules/language-server/src/main/java/nextflow/lsp/ast/ASTUtils.java b/modules/language-server/src/main/java/nextflow/lsp/ast/ASTUtils.java
@@ -22,6 +22,8 @@
 
 import nextflow.script.ast.FeatureFlagNode;
 import nextflow.script.ast.IncludeVariable;
+import nextflow.script.dsl.Constant;
+import nextflow.script.dsl.Description;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.FieldNode;
@@ -42,6 +44,8 @@
 import org.codehaus.groovy.ast.expr.VariableExpression;
 import org.codehaus.groovy.ast.stmt.BlockStatement;
 
+import static nextflow.script.ast.ASTHelpers.*;
+
 /**
  * Utility methods for querying an AST.
  *
@@ -170,10 +174,30 @@ public static ClassNode getTypeOfNode(ASTNode node, ASTNodeCache ast) {
     }
 
     private static FieldNode getFieldFromExpression(PropertyExpression node, ASTNodeCache ast) {
-        var classNode = getTypeOfNode(node.getObjectExpression(), ast);
-        if( classNode == null )
+        var cn = getTypeOfNode(node.getObjectExpression(), ast);
+        if( cn == null )
             return null;
-        return classNode.getField(node.getPropertyAsString());
+        var name = node.getPropertyAsString();
+        var result = cn.getField(name);
+        if( result != null )
+            return result;
+        return cn.getMethods().stream()
+            .filter((mn) -> {
+                if( !mn.isPublic() )
+                    return false;
+                var an = findAnnotation(mn, Constant.class);
+                if( !an.isPresent() )
+                    return false;
+                return name.equals(an.get().getMember("value").getText());
+            })
+            .map((mn) -> {
+                var fn = new FieldNode(name, 0xF, mn.getReturnType(), mn.getDeclaringClass(), null);
+                findAnnotation(mn, Description.class).ifPresent((an) -> {
+                    fn.addAnnotation(an);
+                });
+                return fn;
+            })
+            .findFirst().orElse(null);
     }
 
     /**