fix: highlighting issues while typing #28

Author: vknabel

langsrv/document-cache.go

@@ -0,0 +1,18 @@
+package langsrv
+
+import (
+	protocol "github.com/tliron/glsp/protocol_3_16"
+	"github.com/vknabel/lithia/ast"
+	"github.com/vknabel/lithia/parser"
+)
+
+type documentCache struct {
+	documents map[protocol.URI]*textDocumentEntry
+}
+
+type textDocumentEntry struct {
+	item       protocol.TextDocumentItem
+	parser     *parser.Parser
+	fileParser *parser.FileParser
+	sourceFile *ast.SourceFile
+}

langsrv/handler-text-document-did-change.go

@@ -0,0 +1,37 @@
+package langsrv
+
+import (
+	"github.com/tliron/glsp"
+	protocol "github.com/tliron/glsp/protocol_3_16"
+	"github.com/vknabel/lithia/parser"
+)
+
+func textDocumentDidChange(context *glsp.Context, params *protocol.DidChangeTextDocumentParams) error {
+	entry := langserver.documentCache.documents[params.TextDocument.URI]
+	text := entry.item.Text
+	for _, event := range params.ContentChanges {
+		switch e := event.(type) {
+		case protocol.TextDocumentContentChangeEvent:
+			langserver.server.Log.Infof("from: %s", text)
+			text = text[:e.Range.Start.IndexIn(text)] + e.Text + text[e.Range.End.IndexIn(text):]
+			langserver.server.Log.Infof("to: %s", text)
+		case protocol.TextDocumentContentChangeEventWhole:
+			text = e.Text
+		}
+	}
+	entry.item.Text = text
+	fileParser, errs := entry.parser.Parse("default-module", string(params.TextDocument.URI), text)
+	if len(errs) > 0 {
+		// TODO: syntax errors
+		return parser.NewGroupedSyntaxError(errs)
+	}
+	sourceFile, errs := fileParser.ParseSourceFile()
+	if len(errs) > 0 {
+		// TODO: syntax errors
+		return parser.NewGroupedSyntaxError(errs)
+	}
+	langserver.server.Log.Infof("%s: %s", params.TextDocument.URI, text)
+	langserver.documentCache.documents[params.TextDocument.URI].fileParser = fileParser
+	langserver.documentCache.documents[params.TextDocument.URI].sourceFile = sourceFile
+	return nil
+}

langsrv/handler-text-document-did-open.go

@@ -0,0 +1,28 @@
+package langsrv
+
+import (
+	"github.com/tliron/glsp"
+	protocol "github.com/tliron/glsp/protocol_3_16"
+	"github.com/vknabel/lithia/parser"
+)
+
+func textDocumentDidOpen(context *glsp.Context, params *protocol.DidOpenTextDocumentParams) error {
+	lithiaParser := parser.NewParser()
+	fileParser, errs := lithiaParser.Parse("default-module", string(params.TextDocument.URI), params.TextDocument.Text)
+	if len(errs) > 0 {
+		// TODO: syntax errors
+		return parser.NewGroupedSyntaxError(errs)
+	}
+	sourceFile, errs := fileParser.ParseSourceFile()
+	if len(errs) > 0 {
+		// TODO: syntax errors
+		return parser.NewGroupedSyntaxError(errs)
+	}
+	langserver.documentCache.documents[params.TextDocument.URI] = &textDocumentEntry{
+		item:       params.TextDocument,
+		parser:     lithiaParser,
+		fileParser: fileParser,
+		sourceFile: sourceFile,
+	}
+	return nil
+}

langsrv/handler-text-document-semantic-tokens-full.go

@@ -8,12 +8,11 @@ import (
 )
 
 func textDocumentSemanticTokensFull(context *glsp.Context, params *protocol.SemanticTokensParams) (*protocol.SemanticTokens, error) {
-	rc := NewReqContext(params.TextDocument)
-	fileParser, err := rc.createFileParser()
-	if err != nil && fileParser == nil {
-		return nil, err
+	entry := langserver.documentCache.documents[params.TextDocument.URI]
+	if entry == nil {
+		return nil, nil
 	}
-	rootNode := fileParser.Tree.RootNode()
+	rootNode := entry.fileParser.Tree.RootNode()
 	highlightsQuery, err := sitter.NewQuery([]byte(`
 	[
 		"func"

langsrv/lang-server.go

@@ -12,6 +12,15 @@ var lsName = "lithia"
 var debug = true
 var handler protocol.Handler
 
+type lithiaLangserver struct {
+	server        *server.Server
+	documentCache *documentCache
+}
+
+var langserver lithiaLangserver = lithiaLangserver{
+	documentCache: &documentCache{documents: make(map[protocol.URI]*textDocumentEntry)},
+}
+
 func init() {
 	logging.Configure(1, nil)
 
@@ -21,6 +30,9 @@ func init() {
 		Shutdown:    shutdown,
 		SetTrace:    setTrace,
 
+		TextDocumentDidOpen:   textDocumentDidOpen,
+		TextDocumentDidChange: textDocumentDidChange,
+
 		TextDocumentHover:          textDocumentHover,
 		TextDocumentCompletion:     textDocumentCompletion,
 		TextDocumentDefinition:     textDocumentDefinition,
@@ -32,21 +44,21 @@ func init() {
 }
 
 func RunStdio() error {
-	server := server.NewServer(&handler, lsName, debug)
-	return server.RunStdio()
+	langserver.server = server.NewServer(&handler, lsName, debug)
+	return langserver.server.RunStdio()
 }
 
 func RunIPC() error {
-	server := server.NewServer(&handler, lsName, debug)
-	return server.RunNodeJs()
+	langserver.server = server.NewServer(&handler, lsName, debug)
+	return langserver.server.RunNodeJs()
 }
 
 func RunSocket(address string) error {
-	server := server.NewServer(&handler, lsName, debug)
-	return server.RunWebSocket(address)
+	langserver.server = server.NewServer(&handler, lsName, debug)
+	return langserver.server.RunWebSocket(address)
 }
 
 func RunTCP(address string) error {
-	server := server.NewServer(&handler, lsName, debug)
-	return server.RunTCP(address)
+	langserver.server = server.NewServer(&handler, lsName, debug)
+	return langserver.server.RunTCP(address)
 }