updated to version kddp version 0.6.0

Author: bafto

go.mod

@@ -3,7 +3,7 @@ module github.com/DDP-Projekt/DDPLS
 go 1.22.2
 
 require (
-	github.com/DDP-Projekt/Kompilierer v0.5.0-alpha.0.20241114105207-87725aa2f652
+	github.com/DDP-Projekt/Kompilierer v0.5.0-alpha.0.20250204153322-22e1c6b046b9
 	github.com/tliron/commonlog v0.2.8
 	github.com/tliron/glsp v0.2.2-0.20240309182338-ab78d718ad7d
 )
@@ -22,8 +22,8 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/sourcegraph/jsonrpc2 v0.2.0 // indirect
 	github.com/tliron/kutil v0.3.13 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
 )

go.sum

@@ -1,9 +1,5 @@
-github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240810130912-13f2cd903dcb h1:CZP0ZVHQXduIWCX9UVNOg9DvDTUBDPGwuPBCxOWHkEQ=
-github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240810130912-13f2cd903dcb/go.mod h1:vp0zj11n6rP/B+o7BIXmUhhjrpZNO1c7/pf+VPSHIzM=
-github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20241102131659-4a448417a968 h1:dZ8KbwnwHPsJ8Q2kCoErg/kZFLUhrl/1iA+Sty22Tqg=
-github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20241102131659-4a448417a968/go.mod h1:vp0zj11n6rP/B+o7BIXmUhhjrpZNO1c7/pf+VPSHIzM=
-github.com/DDP-Projekt/Kompilierer v0.5.0-alpha.0.20241114105207-87725aa2f652 h1:VoMCTQFQogAYvpNitcyBu73iCChrJ+FaBfTupWtNGMc=
-github.com/DDP-Projekt/Kompilierer v0.5.0-alpha.0.20241114105207-87725aa2f652/go.mod h1:vp0zj11n6rP/B+o7BIXmUhhjrpZNO1c7/pf+VPSHIzM=
+github.com/DDP-Projekt/Kompilierer v0.5.0-alpha.0.20250204153322-22e1c6b046b9 h1:J80ut6zkCCwEBh0IoKFtENJVmssq5K8Fb539di857DY=
+github.com/DDP-Projekt/Kompilierer v0.5.0-alpha.0.20250204153322-22e1c6b046b9/go.mod h1:FL5eYp6AuDeKh15doNtcOyESwUg7JmVOhOi4J/EepFY=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -43,14 +39,14 @@ github.com/tliron/glsp v0.2.2-0.20240309182338-ab78d718ad7d h1:vLXYsCOnhX9EJ/dc+
 github.com/tliron/glsp v0.2.2-0.20240309182338-ab78d718ad7d/go.mod h1:GMVWDNeODxHzmDPvYbYTCs7yHVaEATfYtXiYJ9w1nBg=
 github.com/tliron/kutil v0.3.13 h1:hB2k7zWYhuuQ8pqJ6Gu/LxDw8UUnjBlhBbwUt5rUiSs=
 github.com/tliron/kutil v0.3.13/go.mod h1:sazY84VhpRez9rFf6ajtZBdpThJ/OIVL7Mue6GC/rds=
-golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

handlers/completion.go

@@ -263,26 +263,34 @@ func appendDDPTypes(items []protocol.CompletionItem) []protocol.CompletionItem {
 }
 
 func appendDotCompletion(items []protocol.CompletionItem, ident *ast.Ident, pos protocol.Position) []protocol.CompletionItem {
-	if ident != nil && ident.Declaration != nil && ddptypes.IsStruct(ident.Declaration.Type) {
-		structType := ident.Declaration.Type.(*ddptypes.StructType)
-		for _, field := range structType.Fields {
-			items = append(items, protocol.CompletionItem{
-				Kind:     ptr(protocol.CompletionItemKindField),
-				Label:    field.Name,
-				SortText: ptr("0"),
-				TextEdit: protocol.TextEdit{
-					NewText: fmt.Sprintf("%s von %s", field.Name, ident.Declaration.Name()),
-					Range: protocol.Range{
-						Start: helper.ToProtocolPosition(ident.GetRange().Start),
-						End: protocol.Position{
-							Line:      pos.Line,
-							Character: pos.Character,
-						},
+	if ident == nil || ident.Declaration == nil {
+		return items
+	}
+	if _, isConst := ident.Declaration.(*ast.ConstDecl); isConst {
+		return items
+	}
+	if !ddptypes.IsStruct(ident.Declaration.(*ast.VarDecl).Type) {
+		return items
+	}
+
+	structType := ident.Declaration.(*ast.VarDecl).Type.(*ddptypes.StructType)
+	for _, field := range structType.Fields {
+		items = append(items, protocol.CompletionItem{
+			Kind:     ptr(protocol.CompletionItemKindField),
+			Label:    field.Name,
+			SortText: ptr("0"),
+			TextEdit: protocol.TextEdit{
+				NewText: fmt.Sprintf("%s von %s", field.Name, ident.Declaration.Name()),
+				Range: protocol.Range{
+					Start: helper.ToProtocolPosition(ident.GetRange().Start),
+					End: protocol.Position{
+						Line:      pos.Line,
+						Character: pos.Character,
 					},
 				},
-				FilterText: ptr(fmt.Sprintf("%s.%s", ident.Declaration.Name(), field.Name)),
-			})
-		}
+			},
+			FilterText: ptr(fmt.Sprintf("%s.%s", ident.Declaration.Name(), field.Name)),
+		})
 	}
 	return items
 }

handlers/hover.go

@@ -136,16 +136,25 @@ func (h *hoverVisitor) VisitTypeDefDecl(d *ast.TypeDefDecl) ast.VisitResult {
 func (h *hoverVisitor) VisitIdent(e *ast.Ident) ast.VisitResult {
 	if decl, ok := e.Declaration, e.Declaration != nil; ok {
 		header := ""
-		if decl.Mod.FileName != h.file {
-			header = fmt.Sprintf("%s\n", h.getHoverFilePath(decl.Mod.FileName))
+		if decl.Module().FileName != h.file {
+			header = fmt.Sprintf("%s\n", h.getHoverFilePath(decl.Module().FileName))
 		}
 		comment := trimComment(decl.Comment())
 		pRange := helper.ToProtocolRange(e.GetRange())
+
+		var typ ddptypes.Type
+		switch decl := decl.(type) {
+		case *ast.ConstDecl:
+			typ = decl.Type
+		case *ast.VarDecl:
+			typ = decl.Type
+		}
+
 		h.hover = &protocol.Hover{
 			Contents: protocol.MarkupContent{
 				Kind: protocol.MarkupKindMarkdown,
 				Value: fmt.Sprintf(
-					"%s%s\n```ddp\n%s\n```", header, comment, decl.Type,
+					"%s%s\n```ddp\n%s\n```", header, comment, typ,
 				),
 			},
 			Range: &pRange,