Skip to content

feat(lsp): Support displaying multiple errors in the lsp #2354

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

Merged
ospencer merged 2 commits into from
Feb 8, 2026
Merged

feat(lsp): Support displaying multiple errors in the lsp #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c982581
feat(lsp): Support displaying multiple errors in the lsp
spotandjake Feb 5, 2026
311960d
chore: Apply suggestions from oscar code review
spotandjake Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions compiler/src/compile.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ let compile_wasi_polyfill = () => {

let reset_compiler_state = () => {
Driver.reset();
Location.reset_exceptions();
Ident.setup();
Ctype.reset_levels();
Env.clear_persistent_structures();
Expand Down
201 changes: 87 additions & 114 deletions compiler/src/language_server/code_file.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module NotificationParams = {

type compile_result = {
program: option(Typedtree.typed_program),
error: option(Protocol.diagnostic),
error: list(Protocol.diagnostic),
warnings: list(Protocol.diagnostic),
};

Expand Down Expand Up @@ -75,110 +75,86 @@ let compile_source = (uri, source) => {
})
) {
| exception exn =>
switch (Grain_parsing.Location.error_of_exn(exn)) {
| Some(`Ok(e)) =>
let (file, line, startchar) =
Grain_parsing.Location.get_pos_info(e.error_loc.loc_start);
let (_, endline, endchar) =
Grain_parsing.Location.get_pos_info(e.error_loc.loc_end);

let startchar = startchar < 0 ? 0 : startchar;
let endchar = endchar < 0 ? 0 : endchar;

let error: Protocol.diagnostic =
if (filename == file) {
let source_range: Protocol.range = {
range_start: {
line: line - 1,
character: startchar,
},
range_end: {
line: endline - 1,
character: endchar,
},
};

{
range: source_range,
severity: Error,
message: e.msg,
related_information: [],
};
} else {
let source_range: Protocol.range = {
range_start: {
line: 0,
character: 0,
},
range_end: {
line: 0,
character: 1,
},
};
let file_start_range: Protocol.range = {
range_start: {
line: 0,
character: 0,
},
range_end: {
line: 0,
character: 1,
},
};
let errors =
List.map(
exn => {
switch (Grain_parsing.Location.error_of_exn(exn)) {
| Some(`Ok(e)) =>
let (file, line, startchar) =
Grain_parsing.Location.get_pos_info(e.error_loc.loc_start);
let (_, endline, endchar) =
Grain_parsing.Location.get_pos_info(e.error_loc.loc_end);

let file_range: Protocol.range = {
range_start: {
line: line - 1,
character: startchar,
},
range_end: {
line: endline - 1,
character: endchar,
},
};
let startchar = startchar < 0 ? 0 : startchar;
let endchar = endchar < 0 ? 0 : endchar;

{
range: source_range,
severity: Error,
message: "Failed to compile " ++ file,
related_information: [
{
location: {
uri: Utils.filename_to_uri(file),
range: file_range,
},
message: e.msg,
let file_range: Protocol.range = {
range_start: {
line: line - 1,
character: startchar,
},
range_end: {
line: endline - 1,
character: endchar,
},
],
};
};
};

{
program: None,
error: Some(error),
warnings: [],
};
| _ =>
let range: Protocol.range = {
range_start: {
line: 0,
character: 0,
},
range_end: {
line: 0,
character: 1,
let error: Protocol.diagnostic =
if (filename == file) {
{
range: file_range,
severity: Error,
message: e.msg,
related_information: [],
};
} else {
{
range: file_start_range,
severity: Error,
message: "Failed to compile " ++ file,
related_information: [
{
location: {
uri: Utils.filename_to_uri(file),
range: file_range,
},
message: e.msg,
},
],
};
};
error;
| _ => {
range: file_start_range,
severity: Error,
message: "Unable to parse",
related_information: [],
}
}
},
};

{
program: None,
error:
Some({
range,
severity: Error,
message: "Unable to parse",
related_information: [],
}),
warnings: [],
};
}

[exn, ...Grain_parsing.Location.reported_exceptions^],
);
{
program: None,
error: errors,
warnings: [],
};
| {cstate_desc: TypedWellFormed(typed_program)} =>
let warnings =
List.map(warning_to_diagnostic, Grain_utils.Warnings.get_warnings());
{
program: Some(typed_program),
error: None,
error: [],
warnings,
};
| _ =>
Expand All @@ -195,13 +171,14 @@ let compile_source = (uri, source) => {

{
program: None,
error:
Some({
error: [
{
range,
severity: Error,
message: "Compilation failed with an internal error",
related_information: [],
}),
},
],
warnings: [],
};
};
Expand All @@ -211,13 +188,9 @@ let send_diagnostics =
(
~uri,
warnings: list(Protocol.diagnostic),
error: option(Protocol.diagnostic),
errors: list(Protocol.diagnostic),
) => {
let diagnostics =
switch (error) {
| None => warnings
| Some(err) => [err, ...warnings]
};
let diagnostics = List.append(errors, warnings);

Protocol.notification(
~method="textDocument/publishDiagnostics",
Expand Down Expand Up @@ -259,7 +232,7 @@ module DidOpen = {

let compilerRes = compile_source(uri, params.text_document.text);
switch (compilerRes) {
| {program: Some(typed_program), error: None, warnings} =>
| {program: Some(typed_program), error: [], warnings} =>
Hashtbl.replace(
compiled_code,
uri,
Expand All @@ -271,10 +244,10 @@ module DidOpen = {
);
switch (warnings) {
| [] => clear_diagnostics(~uri, ())
| _ => send_diagnostics(~uri, warnings, None)
| _ => send_diagnostics(~uri, warnings, [])
};

| {program, error: Some(err), warnings} =>
| {program, error: [_, ..._] as errs, warnings} =>
switch (Hashtbl.find_opt(compiled_code, uri)) {
| Some(code) =>
Hashtbl.replace(
Expand All @@ -287,8 +260,8 @@ module DidOpen = {
)
| None => ()
};
send_diagnostics(~uri, warnings, Some(err));
| {program: None, error: None, warnings} => clear_diagnostics(~uri, ())
send_diagnostics(~uri, warnings, errs);
| {program: None, error: [], warnings} => clear_diagnostics(~uri, ())
};
};
};
Expand Down Expand Up @@ -326,7 +299,7 @@ module DidChange = {

let compilerRes = compile_source(uri, change.text);
switch (compilerRes) {
| {program: Some(typed_program), error: None, warnings} =>
| {program: Some(typed_program), error: [], warnings} =>
Hashtbl.replace(
compiled_code,
uri,
Expand All @@ -338,10 +311,10 @@ module DidChange = {
);
switch (warnings) {
| [] => clear_diagnostics(~uri, ())
| _ => send_diagnostics(~uri, warnings, None)
| _ => send_diagnostics(~uri, warnings, [])
};

| {program, error: Some(err), warnings} =>
| {program, error: [_, ..._] as errs, warnings} =>
switch (Hashtbl.find_opt(compiled_code, uri)) {
| Some(code) =>
Hashtbl.replace(
Expand All @@ -354,8 +327,8 @@ module DidChange = {
)
| None => ()
};
send_diagnostics(~uri, warnings, Some(err));
| {program: None, error: None, warnings} => clear_diagnostics(~uri, ())
send_diagnostics(~uri, warnings, errs);
| {program: None, error: [], warnings} => clear_diagnostics(~uri, ())
};
};
};
7 changes: 6 additions & 1 deletion compiler/src/parsing/location.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ let register_error_of_exn = f => error_of_exn := [f, ...error_of_exn^];

exception Already_displayed_error = Warnings.Errors;

let error_of_exn = exn =>
let error_of_exn = exn => {
switch (exn) {
| Already_displayed_error => Some(`Already_displayed)
| _ =>
Expand All @@ -554,6 +554,7 @@ let error_of_exn = exn =>

loop(error_of_exn^);
};
};

let rec default_error_reporter = (ppf, {error_loc, msg, sub, if_highlight}) => {
fprintf(ppf, "@[<v>%a %s", print_error, error_loc, msg);
Expand Down Expand Up @@ -593,7 +594,11 @@ let () =

external reraise: exn => 'a = "%reraise";

let reported_exceptions = ref([]);
let reset_exceptions = () => reported_exceptions := [];

let rec report_exception = (ppf, exn) => {
reported_exceptions := [exn, ...reported_exceptions^];
let rec loop = (n, exn) =>
switch (error_of_exn(exn)) {
| None => reraise(exn)
Expand Down
4 changes: 4 additions & 0 deletions compiler/src/parsing/location.rei
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ let error_of_printer: (t, (formatter, 'a) => unit, 'a) => error;

let error_of_printer_file: ((formatter, 'a) => unit, 'a) => error;

let reported_exceptions: ref(list(exn));

let reset_exceptions: unit => unit;

let error_of_exn:
exn =>
option(
Expand Down