language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Update LSP

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-20 10:55:16 -06:00
parent 0db1cd9c28
commit b706a57e16
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
6 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/lang_srv/src/convert.rs
View file

@ -72,7 +72,7 @@ pub(crate) mod diag {
use std::path::Path;
use roc_load::LoadingProblem;
use roc_region::all::LineInfo;
use roc_region::all::{LineInfo, Region};
use roc_solve_problem::TypeError;
use roc_reporting::report::{RocDocAllocator, Severity};
@ -141,6 +141,12 @@ pub(crate) mod diag {
LoadingProblem::FormattedReport(report) => {
msg = report;
}
LoadingProblem::ImportCycle(_, _) => {
msg = format!("Circular dependency between modules");
}
LoadingProblem::IncorrectModuleName(_) => {
msg = format!("Incorrect module name");
}
};
Some(Diagnostic {
@ -167,7 +173,10 @@ pub(crate) mod diag {
type Feed = ProblemFmt<'a>;
fn into_lsp_diagnostic(self, fmt: &'a ProblemFmt<'a>) -> Option<Diagnostic> {
let range = self.region().to_range(fmt.line_info);
let range = self
.region()
.unwrap_or_else(Region::zero)
.to_range(fmt.line_info);
let report = roc_reporting::report::can_problem(
&fmt.alloc,
@ -199,7 +208,10 @@ pub(crate) mod diag {
type Feed = ProblemFmt<'a>;
fn into_lsp_diagnostic(self, fmt: &'a ProblemFmt<'a>) -> Option<Diagnostic> {
let range = self.region().to_range(fmt.line_info);
let range = self
.region()
.unwrap_or_else(Region::zero)
.to_range(fmt.line_info);
let report = roc_reporting::report::type_problem(
&fmt.alloc,

1
crates/lang_srv/src/registry.rs
View file

@ -75,6 +75,7 @@ impl Document {
Default::default(),
roc_target::TargetInfo::default_x86_64(),
roc_reporting::report::RenderTarget::Generic,
roc_reporting::report::DEFAULT_PALETTE,
);
match loaded {