Compare commits

..

2 Commits

Author SHA1 Message Date
Martino Ferrari
8e13020d50 better signal hover message 2026-01-24 21:37:08 +01:00
Martino Ferrari
c9cc67f663 Minimal changes 2026-01-24 15:33:23 +01:00
3 changed files with 95 additions and 9 deletions

View File

@@ -20,8 +20,6 @@ import (
"cuelang.org/go/cue" "cuelang.org/go/cue"
) )
type CompletionParams struct { type CompletionParams struct {
TextDocument TextDocumentIdentifier `json:"textDocument"` TextDocument TextDocumentIdentifier `json:"textDocument"`
Position Position `json:"position"` Position Position `json:"position"`
@@ -171,7 +169,6 @@ type TextEdit struct {
NewText string `json:"newText"` NewText string `json:"newText"`
} }
func RunServer() { func RunServer() {
reader := bufio.NewReader(os.Stdin) reader := bufio.NewReader(os.Stdin)
for { for {
@@ -783,11 +780,11 @@ func suggestCUEEnums(container *index.ProjectNode, field string) *CompletionList
if err != nil { if err != nil {
continue continue
} }
// Ensure strings are quoted // Ensure strings are quoted
if v.Kind() == cue.StringKind && !strings.HasPrefix(str, "\"") { if v.Kind() == cue.StringKind && !strings.HasPrefix(str, "\"") {
str = fmt.Sprintf("\"%s\"", str) str = fmt.Sprintf("\"%s\"", str)
} }
items = append(items, CompletionItem{ items = append(items, CompletionItem{
Label: str, Label: str,
@@ -981,6 +978,14 @@ func formatNodeInfo(node *index.ProjectNode) string {
typ := node.Metadata["Type"] typ := node.Metadata["Type"]
ds := node.Metadata["DataSource"] ds := node.Metadata["DataSource"]
if ds == "" {
if node.Parent != nil && node.Parent.Name == "Signals" {
if node.Parent.Parent != nil {
ds = node.Parent.Parent.Name
}
}
}
if typ != "" || ds != "" { if typ != "" || ds != "" {
sigInfo := "\n" sigInfo := "\n"
if typ != "" { if typ != "" {

View File

@@ -13,7 +13,7 @@ package schema
StateMachineEvent: { StateMachineEvent: {
NextState!: string NextState!: string
NextStateError!: string NextStateError!: string
Timeout: uint32 Timeout?: uint32
[_= !~"^(Class|NextState|Timeout|NextStateError|[#_$].+)$"]: Message [_= !~"^(Class|NextState|Timeout|NextStateError|[#_$].+)$"]: Message
... ...
} }

View File

@@ -0,0 +1,81 @@
package integration
import (
"strings"
"testing"
"github.com/marte-community/marte-dev-tools/internal/index"
"github.com/marte-community/marte-dev-tools/internal/lsp"
"github.com/marte-community/marte-dev-tools/internal/parser"
)
func TestHoverDataSourceName(t *testing.T) {
// Setup
lsp.Tree = index.NewProjectTree()
lsp.Documents = make(map[string]string)
content := `
+DS1 = {
Class = FileReader
+Signals = {
Sig1 = { Type = uint32 }
}
}
+GAM1 = {
Class = IOGAM
+InputSignals = {
S1 = {
DataSource = DS1
Alias = Sig1
}
}
}
`
uri := "file://test_ds.marte"
lsp.Documents[uri] = content
p := parser.NewParser(content)
cfg, err := p.Parse()
if err != nil {
t.Fatalf("Parse error: %v", err)
}
lsp.Tree.AddFile("test_ds.marte", cfg)
lsp.Tree.ResolveReferences()
// Test 1: Explicit Signal (Sig1)
// Position: "Sig1" at line 5 (0-based 4)
// Line 4: " Sig1 = { Type = uint32 }"
// Col: 8
params1 := lsp.HoverParams{
TextDocument: lsp.TextDocumentIdentifier{URI: uri},
Position: lsp.Position{Line: 4, Character: 9},
}
hover1 := lsp.HandleHover(params1)
if hover1 == nil {
t.Fatal("Expected hover for Sig1")
}
content1 := hover1.Contents.(lsp.MarkupContent).Value
// Expectation: explicit signal shows owner datasource
if !strings.Contains(content1, "**DataSource**: `+DS1`") && !strings.Contains(content1, "**DataSource**: `DS1`") {
t.Errorf("Expected DataSource: +DS1 in hover for Sig1, got: %s", content1)
}
// Test 2: Implicit Signal (S1)
// Position: "S1" at line 11 (0-based 10)
params2 := lsp.HoverParams{
TextDocument: lsp.TextDocumentIdentifier{URI: uri},
Position: lsp.Position{Line: 10, Character: 9},
}
hover2 := lsp.HandleHover(params2)
if hover2 == nil {
t.Fatal("Expected hover for S1")
}
content2 := hover2.Contents.(lsp.MarkupContent).Value
// Expectation: implicit signal shows referenced datasource
if !strings.Contains(content2, "**DataSource**: `DS1`") {
t.Errorf("Expected DataSource: DS1 in hover for S1, got: %s", content2)
}
}