Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Language Server: Include error notes as related information in diagnostic #276

Merged
merged 1 commit into from
Jul 29, 2020
Merged

Language Server: Include error notes as related information in diagnostic #276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 30 additions & 3 deletions languageserver/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ func (s *Server) getDiagnostics(

if parseError != nil {
if parentErr, ok := parseError.(errors.ParentError); ok {
parserDiagnostics := getDiagnosticsForParentError(conn, parentErr)
parserDiagnostics := getDiagnosticsForParentError(conn, uri, parentErr)
diagnostics = append(diagnostics, parserDiagnostics...)
}
}
Expand Down Expand Up @@ -1031,7 +1031,7 @@ func (s *Server) getDiagnostics(

if checkError != nil {
if parentErr, ok := checkError.(errors.ParentError); ok {
checkerDiagnostics := getDiagnosticsForParentError(conn, parentErr)
checkerDiagnostics := getDiagnosticsForParentError(conn, uri, parentErr)
diagnostics = append(diagnostics, checkerDiagnostics...)
}
}
Expand All @@ -1052,7 +1052,13 @@ func (s *Server) getDiagnostics(
// a diagnostic. Both parser and checker errors can be unpacked.
//
// Logs any conversion failures to the client.
func getDiagnosticsForParentError(conn protocol.Conn, err errors.ParentError) (diagnostics []protocol.Diagnostic) {
func getDiagnosticsForParentError(
conn protocol.Conn,
uri protocol.DocumentUri,
err errors.ParentError,
) (
diagnostics []protocol.Diagnostic,
) {
for _, childErr := range err.ChildErrors() {
convertibleErr, ok := childErr.(convertibleError)
if !ok {
Expand All @@ -1063,6 +1069,27 @@ func getDiagnosticsForParentError(conn protocol.Conn, err errors.ParentError) (d
continue
}
diagnostic := convertError(convertibleErr)

if errorNotes, ok := convertibleErr.(errors.ErrorNotes); ok {
for _, errorNote := range errorNotes.ErrorNotes() {
if positioned, hasPosition := errorNote.(ast.HasPosition); hasPosition {
startPos := positioned.StartPosition()
endPos := positioned.EndPosition()
message := errorNote.Message()

diagnostic.RelatedInformation = append(diagnostic.RelatedInformation,
protocol.DiagnosticRelatedInformation{
Location: protocol.Location{
URI: uri,
Range: conversion.ASTToProtocolRange(startPos, endPos),
},
Message: message,
},
)
}
}
}

diagnostics = append(diagnostics, diagnostic)
}

Expand Down