Improve signature help active params

internal/langserver/handlers/signature_help.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
-	"github.com/hashicorp/terraform-ls/internal/protocol"
 	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
@@ -34,27 +33,6 @@ func (svc *service) SignatureHelp(ctx context.Context, params lsp.SignatureHelpP
 	if err != nil {
 		return nil, err
 	}
-	if sig == nil {
-		return nil, nil
-	}
 
-	parameters := make([]protocol.ParameterInformation, 0)
-	for _, p := range sig.Parameters {
-		parameters = append(parameters, lsp.ParameterInformation{
-			Label:         p.Name,
-			Documentation: p.Description.Value,
-		})
-	}
-	return &lsp.SignatureHelp{
-		Signatures: []lsp.SignatureInformation{
-			{
-				Label:           sig.Name,
-				Documentation:   sig.Description.Value,
-				Parameters:      parameters,
-				ActiveParameter: 1,
-			},
-		},
-		ActiveSignature: 0,
-		ActiveParameter: 0,
-	}, nil
+	return ilsp.ToSignatureHelp(sig), nil
 }

internal/lsp/signature.go

@@ -0,0 +1,32 @@
+package lsp
+
+import (
+	"github.com/hashicorp/hcl-lang/lang"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
+)
+
+func ToSignatureHelp(signature *lang.FuncSignature) *lsp.SignatureHelp {
+	if signature == nil {
+		return nil
+	}
+
+	parameters := make([]lsp.ParameterInformation, 0)
+	for _, p := range signature.Parameters {
+		parameters = append(parameters, lsp.ParameterInformation{
+			Label:         p.Name,
+			Documentation: p.Description.Value, // TODO? clean
+		})
+	}
+
+	return &lsp.SignatureHelp{
+		Signatures: []lsp.SignatureInformation{
+			{
+				Label:           signature.Name,
+				Documentation:   signature.Description.Value, // TODO? clean
+				Parameters:      parameters,
+				ActiveParameter: signature.ActiveParameter,
+			},
+		},
+		ActiveSignature: 0,
+	}
+}