feat: lsp diagnostics #29

Author: vknabel

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## v0.0.13-next
+## v0.0.13
 
 - lsp: semantic syntax highlighting #28
+- lsp: diagnostics #29
 
 ## v0.0.12
 

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

@@ -3,7 +3,6 @@ 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 {
@@ -12,26 +11,24 @@ func textDocumentDidChange(context *glsp.Context, params *protocol.DidChangeText
 	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)
+		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
+		return nil
 	}
 	sourceFile, errs := fileParser.ParseSourceFile()
 	if len(errs) > 0 {
-		// TODO: syntax errors
-		return parser.NewGroupedSyntaxError(errs)
+		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
+		return nil
 	}
-	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
+	publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), nil)
 	return nil
 }

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

@@ -10,19 +10,20 @@ func textDocumentDidOpen(context *glsp.Context, params *protocol.DidOpenTextDocu
 	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)
+		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
+		return nil
 	}
 	sourceFile, errs := fileParser.ParseSourceFile()
 	if len(errs) > 0 {
-		// TODO: syntax errors
-		return parser.NewGroupedSyntaxError(errs)
+		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
+		return nil
 	}
 	langserver.documentCache.documents[params.TextDocument.URI] = &textDocumentEntry{
 		item:       params.TextDocument,
 		parser:     lithiaParser,
 		fileParser: fileParser,
 		sourceFile: sourceFile,
 	}
+	publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), nil)
 	return nil
 }

langsrv/publish-diagnostics.go

@@ -0,0 +1,48 @@
+package langsrv
+
+import (
+	"github.com/tliron/glsp"
+	protocol "github.com/tliron/glsp/protocol_3_16"
+	"github.com/vknabel/lithia/parser"
+)
+
+func publishSyntaxErrorDiagnostics(context *glsp.Context, textDocumentURI protocol.URI, version uint32, errs []parser.SyntaxError) {
+	diagnostics := make([]protocol.Diagnostic, len(errs))
+	for i, err := range errs {
+		diagnostics[i] = syntaxErrorToDiagnostic(err)
+	}
+
+	versionRef := version
+	context.Notify(protocol.ServerTextDocumentPublishDiagnostics, protocol.PublishDiagnosticsParams{
+		URI:         textDocumentURI,
+		Version:     &versionRef,
+		Diagnostics: diagnostics,
+	})
+}
+
+func syntaxErrorToDiagnostic(err parser.SyntaxError) protocol.Diagnostic {
+	return protocol.Diagnostic{
+		Source:   &lsName,
+		Range:    rangeFromSourceLocation(err.SourceLocation),
+		Severity: newSeverityRef(protocol.DiagnosticSeverityError),
+		Message:  err.Message,
+	}
+}
+
+func rangeFromSourceLocation(location parser.SourceLocation) protocol.Range {
+	return protocol.Range{
+		Start: protocol.Position{
+			Line:      location.Node.StartPoint().Row,
+			Character: location.Node.StartPoint().Column,
+		},
+		End: protocol.Position{
+			Line:      location.Node.EndPoint().Row,
+			Character: location.Node.EndPoint().Column,
+		},
+	}
+}
+
+func newSeverityRef(sev protocol.DiagnosticSeverity) *protocol.DiagnosticSeverity {
+	severity := sev
+	return &severity
+}