Type annotations

Author: bentsherman

src/main/java/nextflow/lsp/ast/ASTNodeStringUtils.java

@@ -114,6 +114,10 @@ private static String workflowToLabel(WorkflowNode node) {
         for( var take : takes ) {
             fmt.appendIndent();
             fmt.append(take.getName());
+            if( fmt.hasType(take) ) {
+                fmt.append(": ");
+                fmt.visitTypeAnnotation(take.getType());
+            }
             fmt.appendNewLine();
         }
         fmt.appendNewLine();

src/main/java/nextflow/lsp/services/SemanticTokensVisitor.java

@@ -69,6 +69,10 @@ public void append(ASTNode node, String type) {
         append(node.getLineNumber() - 1, node.getColumnNumber() - 1, length, type);
     }
 
+    public void append(ASTNode node, int length, String type) {
+        append(node.getLineNumber() - 1, node.getColumnNumber() - 1, length, type);
+    }
+
     public void append(TokenPosition start, String text, String type) {
         append(start.line(), start.character(), text.length(), type);
     }
@@ -143,7 +147,7 @@ public void visitParameters(Parameter[] parameters) {
             if( param.getNodeMetaData("_START_NAME") instanceof TokenPosition start )
                 append(start, param.getName(), SemanticTokenTypes.Parameter);
             else
-                append(param.getLineNumber() - 1, param.getColumnNumber() - 1, param.getName().length(), SemanticTokenTypes.Parameter);
+                append(param, param.getName().length(), SemanticTokenTypes.Parameter);
             if( param.hasInitialExpression() )
                 visit(param.getInitialExpression());
         }
@@ -184,7 +188,7 @@ public void visitVariableExpression(VariableExpression node) {
         else if( mn != null && !findAnnotation(mn, Constant.class).isPresent() )
             append(node, SemanticTokenTypes.Function);
         else if( !(variable instanceof DynamicVariable) )
-            append(node, SemanticTokenTypes.Variable);
+            append(node, node.getName().length(), SemanticTokenTypes.Variable);
     }
 
     @Override

src/main/java/nextflow/lsp/services/script/ScriptSemanticTokensProvider.java

@@ -137,14 +137,14 @@ protected void visitWorkflowEmits(List<Statement> emits) {
                 var emit = es.getExpression();
                 if( emit instanceof AssignmentExpression assign ) {
                     var ve = (VariableExpression)assign.getLeftExpression();
-                    tok.append(ve, SemanticTokenTypes.Parameter);
+                    tok.append(ve, ve.getName().length(), SemanticTokenTypes.Parameter);
                     tok.visit(assign.getRightExpression());
                 }
                 else if( emit instanceof VariableExpression ve ) {
                     if( emits.size() == 1 )
                         tok.visit(emit);
                     else
-                        tok.append(ve, SemanticTokenTypes.Parameter);
+                        tok.append(ve, ve.getName().length(), SemanticTokenTypes.Parameter);
                 }
                 else {
                     tok.visit(stmt);