update to latest parser update

bafto · bafto · commit 37be49b4821a · 2023-09-22T16:36:57.000+02:00
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/DDP-Projekt/DDPLS
 go 1.18
 
 require (
-	github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230918114606-e6176aad1b7b
+	github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230922143518-be8902c28e76
 	github.com/tliron/glsp v0.1.2-0.20220628161923-1d70ae869611
 	github.com/tliron/kutil v0.1.68
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230918114606-e6176aad1b7b h1:ZSEmjFUsEFT+odKTz3KABtswjgiRhc1/IxGRgdQAYpM=
 github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230918114606-e6176aad1b7b/go.mod h1:OVRSCZNQ8LVV8ZH5TuAGTaf0skO06bgV5Y7Wgvdb+NY=
+github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230922143518-be8902c28e76 h1:XEnvK+EzN1yZhZyxSE1qNQdmtwZ0FJPyzbLAuRzRFV8=
+github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230922143518-be8902c28e76/go.mod h1:OVRSCZNQ8LVV8ZH5TuAGTaf0skO06bgV5Y7Wgvdb+NY=
 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/bafto/glsp v0.1.2-0.20230806091905-942e1aee0810 h1:SqEtvmrp0wqvKYw9J7DSvnMM8l12cDj98k8vKlVB/7U=
diff --git a/handlers/completion.go b/handlers/completion.go
@@ -147,7 +147,7 @@ var (
 )
 
 func aliasToCompletionItem(alias ast.FuncAlias) protocol.CompletionItem {
-	insertText := ast.TrimStringLit(alias.Original) // remove the ""
+	insertText := ast.TrimStringLit(&alias.Original) // remove the ""
 	details := insertText
 	insertTextMode := protocol.InsertTextFormatPlainText
 	if SupportsSnippets {
@@ -271,7 +271,7 @@ func (vis *importVisitor) VisitImportStmt(imprt *ast.ImportStmt) {
 		// are in an import path
 		*vis.items = make([]protocol.CompletionItem, 0, len(dudenPaths))
 
-		incompletePath := filepath.Dir(ast.TrimStringLit(imprt.FileName))
+		incompletePath := filepath.Dir(ast.TrimStringLit(&imprt.FileName))
 
 		if incompletePath == "." {
 			addDudenPaths(vis.items)
diff --git a/handlers/hover.go b/handlers/hover.go
@@ -97,7 +97,7 @@ func (h *hoverVisitor) VisitFuncCall(e *ast.FuncCall) {
 		var declRange protocol.Range
 
 		if fun.Body != nil {
-			declRange = helper.ToProtocolRange(token.NewRange(fun.Tok, fun.Body.Colon))
+			declRange = helper.ToProtocolRange(token.NewRange(&fun.Tok, &fun.Body.Colon))
 		} else {
 			declRange = helper.ToProtocolRange(fun.GetRange())
 		}
diff --git a/handlers/semanticHighlighting.go b/handlers/semanticHighlighting.go
@@ -122,12 +122,12 @@ func (t *semanticTokenizer) add(tok highlightedToken) {
 }
 
 func (t *semanticTokenizer) VisitVarDecl(d *ast.VarDecl) {
-	t.add(newHightlightedToken(token.NewRange(d.NameTok, d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))
+	t.add(newHightlightedToken(token.NewRange(&d.NameTok, &d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))
 }
 func (t *semanticTokenizer) VisitFuncDecl(d *ast.FuncDecl) {
-	t.add(newHightlightedToken(token.NewRange(d.NameTok, d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))
+	t.add(newHightlightedToken(token.NewRange(&d.NameTok, &d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))
 	for _, param := range d.ParamNames {
-		t.add(newHightlightedToken(token.NewRange(param, param), t.doc, protocol.SemanticTokenTypeParameter, nil))
+		t.add(newHightlightedToken(token.NewRange(&param, &param), t.doc, protocol.SemanticTokenTypeParameter, nil))
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/DDP-Projekt/DDPLS`
`3`	`3`	`go 1.18`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230918114606-e6176aad1b7b`
	`6`	`+ github.com/DDP-Projekt/Kompilierer v0.0.8-pre.0.20230922143518-be8902c28e76`
`7`	`7`	`github.com/tliron/glsp v0.1.2-0.20220628161923-1d70ae869611`
`8`	`8`	`github.com/tliron/kutil v0.1.68`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func (h hoverVisitor) VisitFuncCall(e ast.FuncCall) {`
`97`	`97`	`var declRange protocol.Range`
`98`	`98`
`99`	`99`	`if fun.Body != nil {`
`100`		`- declRange = helper.ToProtocolRange(token.NewRange(fun.Tok, fun.Body.Colon))`
	`100`	`+ declRange = helper.ToProtocolRange(token.NewRange(&fun.Tok, &fun.Body.Colon))`
`101`	`101`	`} else {`
`102`	`102`	`declRange = helper.ToProtocolRange(fun.GetRange())`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,12 @@ func (t *semanticTokenizer) add(tok highlightedToken) {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func (t semanticTokenizer) VisitVarDecl(d ast.VarDecl) {`
`125`		`- t.add(newHightlightedToken(token.NewRange(d.NameTok, d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))`
	`125`	`+ t.add(newHightlightedToken(token.NewRange(&d.NameTok, &d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))`
`126`	`126`	`}`
`127`	`127`	`func (t semanticTokenizer) VisitFuncDecl(d ast.FuncDecl) {`
`128`		`- t.add(newHightlightedToken(token.NewRange(d.NameTok, d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))`
	`128`	`+ t.add(newHightlightedToken(token.NewRange(&d.NameTok, &d.NameTok), t.doc, protocol.SemanticTokenTypeVariable, nil))`
`129`	`129`	`for _, param := range d.ParamNames {`
`130`		`- t.add(newHightlightedToken(token.NewRange(param, param), t.doc, protocol.SemanticTokenTypeParameter, nil))`
	`130`	`+ t.add(newHightlightedToken(token.NewRange(&param, &param), t.doc, protocol.SemanticTokenTypeParameter, nil))`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`