a little less noise in completion

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.4.0-alpha.0.20240727064752-82b1157e21d4
+	github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240727075930-9369ebd7971e
 	github.com/tliron/commonlog v0.2.8
 	github.com/tliron/glsp v0.2.2-0.20240309182338-ab78d718ad7d
 )

go.sum

@@ -1,5 +1,5 @@
-github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240727064752-82b1157e21d4 h1:IFRza81KvPQZ8+7JJ/X7M1v+ppX1uYrsg3NsOwOaDYw=
-github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240727064752-82b1157e21d4/go.mod h1:vp0zj11n6rP/B+o7BIXmUhhjrpZNO1c7/pf+VPSHIzM=
+github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240727075930-9369ebd7971e h1:7ljq6q/rKTPJZ4um9KNfGeULStZpiXw88zVf+IXVT20=
+github.com/DDP-Projekt/Kompilierer v0.4.0-alpha.0.20240727075930-9369ebd7971e/go.mod h1:vp0zj11n6rP/B+o7BIXmUhhjrpZNO1c7/pf+VPSHIzM=
 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=

handlers/completion.go

@@ -13,6 +13,7 @@ import (
 	"github.com/DDP-Projekt/DDPLS/helper"
 	"github.com/DDP-Projekt/DDPLS/log"
 	"github.com/DDP-Projekt/Kompilierer/src/ast"
+	"github.com/DDP-Projekt/Kompilierer/src/ddperror"
 	"github.com/DDP-Projekt/Kompilierer/src/ddppath"
 	"github.com/DDP-Projekt/Kompilierer/src/ddptypes"
 	"github.com/tliron/glsp"
@@ -22,9 +23,16 @@ import (
 func CreateTextDocumentCompletion(dm *documents.DocumentManager) protocol.TextDocumentCompletionFunc {
 	return RecoverAnyErr(func(context *glsp.Context, params *protocol.CompletionParams) (any, error) {
 		var docModule *ast.Module
+		var latestError *ddperror.Error
 		// Get the current Document
 		if d, ok := dm.Get(params.TextDocument.URI); ok {
 			docModule = d.Module
+			for _, err := range d.LatestErrors {
+				if helper.IsInRange(err.Range, params.Position) {
+					latestError = &err
+					break
+				}
+			}
 		}
 
 		// in case of import completion we need nothing else
@@ -58,6 +66,7 @@ func CreateTextDocumentCompletion(dm *documents.DocumentManager) protocol.TextDo
 
 		table := visitor.Table
 		varItems := make(map[string]struct{}, 16)
+		wantType := latestError != nil && latestError.Code == ddperror.SYN_EXPECTED_TYPENAME
 		for table != nil {
 			for name := range table.Declarations {
 				decl, _, _ := table.LookupDecl(name)
@@ -67,20 +76,14 @@ func CreateTextDocumentCompletion(dm *documents.DocumentManager) protocol.TextDo
 
 				switch decl := decl.(type) {
 				case *ast.VarDecl:
-					if _, ok := varItems[name]; !ok {
-						varItems[name] = struct{}{}
-						items = append(items, protocol.CompletionItem{
-							Kind:  ptr(protocol.CompletionItemKindVariable),
-							Label: name,
-						})
-					}
+					items = appendVarName(items, varItems, decl.Name(), wantType)
 				case *ast.FuncDecl:
 					for _, a := range decl.Aliases {
-						items = append(items, aliasToCompletionItem(a)...)
+						items = appendAlias(items, a, wantType)
 					}
 				case *ast.StructDecl:
 					for _, a := range decl.Aliases {
-						items = append(items, aliasToCompletionItem(a)...)
+						items = appendAlias(items, a, wantType)
 					}
 					items = appendTypeName(items, decl)
 				case *ast.TypeAliasDecl:
@@ -96,6 +99,24 @@ func CreateTextDocumentCompletion(dm *documents.DocumentManager) protocol.TextDo
 	})
 }
 
+func appendVarName(items []protocol.CompletionItem, varItems map[string]struct{}, name string, wantType bool) []protocol.CompletionItem {
+	if _, ok := varItems[name]; !ok && !wantType {
+		varItems[name] = struct{}{}
+		return append(items, protocol.CompletionItem{
+			Kind:  ptr(protocol.CompletionItemKindVariable),
+			Label: name,
+		})
+	}
+	return items
+}
+
+func appendAlias(items []protocol.CompletionItem, a ast.Alias, wantType bool) []protocol.CompletionItem {
+	if wantType {
+		return items
+	}
+	return append(items, aliasToCompletionItem(a)...)
+}
+
 func appendTypeName(items []protocol.CompletionItem, decl ast.Declaration) []protocol.CompletionItem {
 	return append(items, protocol.CompletionItem{
 		Kind:  ptr(protocol.CompletionItemKindClass),
@@ -271,6 +292,7 @@ type tableVisitor struct {
 	tempTable       *ast.SymbolTable
 	pos             protocol.Position
 	ident           *ast.Ident
+	badDecl         *ast.BadDecl
 	isDotCompletion bool
 }
 
@@ -279,6 +301,7 @@ var (
 	_ ast.ScopeSetter        = (*tableVisitor)(nil)
 	_ ast.ConditionalVisitor = (*tableVisitor)(nil)
 	_ ast.IdentVisitor       = (*tableVisitor)(nil)
+	_ ast.BadDeclVisitor     = (*tableVisitor)(nil)
 )
 
 func (*tableVisitor) Visitor() {}
@@ -309,6 +332,11 @@ func (t *tableVisitor) VisitIdent(ident *ast.Ident) ast.VisitResult {
 	return ast.VisitRecurse
 }
 
+func (t *tableVisitor) VisitBadDecl(d *ast.BadDecl) ast.VisitResult {
+	t.badDecl = d
+	return ast.VisitRecurse
+}
+
 type importVisitor struct {
 	pos               protocol.Position
 	items             []protocol.CompletionItem