language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 12:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix order of elaborated queries

Browse source
This commit is contained in:
Ayaz Hafiz 2023-04-02 00:30:34 -05:00
parent 0e47140eaf
commit c7a1d29695
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/compiler/solve/tests/uitest.rs
View file

@ -290,21 +290,17 @@ fn reconstruct_comment_line<W: io::Write>(
typ,
source,
offset_line,
mut queries_in_instantiation,
queries_in_instantiation,
} => {
reflow.write(&typ)?;
// Write the source on new line, but at the reflow column the comment is aligned at.
reflow.set_content(source_line_column.column as _);
reflow.write("\n")?;
queries_in_instantiation.reverse();
write_source_with_answers(
reflow,
source.trim_end(),
queries_in_instantiation,
offset_line as _,
)
let queries = queries_in_instantiation.into_sorted();
write_source_with_answers(reflow, source.trim_end(), queries, offset_line as _)
}
}
}

4
crates/compiler/solve/tests/uitest/instantiate/call_generic_ability_member.txt
View file

@ -19,12 +19,12 @@ main = {
a: caller (@O {}),
# ^^^^^^{inst} O -[[caller(7)]]-> {}
# │ caller = \x -> consume x
# │ ^^^^^^^ X#consume(2): O -[[consumeO(5)]]-> {}
# │ ^ O
# │ ^^^^^^^ X#consume(2): O -[[consumeO(5)]]-> {}
b: caller (@P {}),
# ^^^^^^{inst} P -[[caller(7)]]-> {}
# │ caller = \x -> consume x
# │ ^^^^^^^ X#consume(2): P -[[consumeP(6)]]-> {}
# │ ^ P
# │ ^^^^^^^ X#consume(2): P -[[consumeP(6)]]-> {}
}

5
crates/compiler/test_solve_helpers/src/lib.rs
View file

@ -268,7 +268,7 @@ pub enum Elaboration {
typ: String,
source: String,
offset_line: u32,
queries_in_instantiation: Vec<InferredQuery>,
queries_in_instantiation: InferredQueries,
},
}
@ -301,6 +301,7 @@ impl Program {
}
}
#[derive(Debug)]
pub struct InferredQueries(Vec<InferredQuery>);
impl InferredQueries {
@ -555,7 +556,7 @@ impl<'a> QueryCtx<'a> {
typ,
source: def_source.to_owned(),
offset_line: start.line,
queries_in_instantiation,
queries_in_instantiation: InferredQueries(queries_in_instantiation),
})
}
}