language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 11:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Pretty-print variables bound to multiple abilities

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-12 15:26:49 -05:00
parent 4541b41f7b
commit 94fc58a508
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/compiler/types/src/pretty_print.rs
View file

@ -2,7 +2,7 @@ use crate::subs::{
self, AliasVariables, Content, FlatType, GetSubsSlice, Label, Subs, SubsIndex, UnionLabels,
UnionTags, UnsortedUnionLabels, Variable,
};
use crate::types::{name_type_var, name_type_var_with_hint, RecordField, Uls};
use crate::types::{name_type_var, name_type_var_with_hint, AbilitySet, RecordField, Uls};
use roc_collections::all::MutMap;
use roc_module::ident::{Lowercase, TagName};
use roc_module::symbol::{Interns, ModuleId, Symbol};
@ -541,7 +541,7 @@ fn set_root_name(root: Variable, name: Lowercase, subs: &mut Subs) {
#[derive(Default)]
struct Context<'a> {
able_variables: Vec<(&'a str, Symbol)>,
able_variables: Vec<(&'a str, AbilitySet)>,
recursion_structs_to_expand: Vec<Variable>,
}
@ -568,11 +568,17 @@ fn content_to_string(
ctx.able_variables.sort();
ctx.able_variables.dedup();
for (i, (var, ability)) in ctx.able_variables.into_iter().enumerate() {
for (i, (var, abilities)) in ctx.able_variables.into_iter().enumerate() {
buf.push_str(if i == 0 { " | " } else { ", " });
buf.push_str(var);
buf.push_str(" has ");
write_symbol(&env, ability, &mut buf);
buf.push_str(" has");
for (i, ability) in abilities.into_sorted_iter().enumerate() {
if i > 0 {
buf.push_str(" &");
}
buf.push(' ');
write_symbol(&env, ability, &mut buf);
}
}
buf
@ -625,16 +631,14 @@ fn write_content<'a>(
let name = opt_name_index
.map(|name_index| subs.field_names[name_index.index as usize].as_str())
.unwrap_or(WILDCARD);
// TODO(multi-abilities)
let abilities = subs.get_subs_slice(*abilities);
ctx.able_variables.push((name, abilities[0]));
let abilities = AbilitySet::from_iter(subs.get_subs_slice(*abilities).iter().copied());
ctx.able_variables.push((name, abilities));
buf.push_str(name);
}
RigidAbleVar(name_index, abilities) => {
let name = subs.field_names[name_index.index as usize].as_str();
// TODO(multi-abilities)
let abilities = subs.get_subs_slice(*abilities);
ctx.able_variables.push((name, abilities[0]));
let abilities = AbilitySet::from_iter(subs.get_subs_slice(*abilities).iter().copied());
ctx.able_variables.push((name, abilities));
buf.push_str(name);
}
RecursionVar {

12
crates/compiler/types/src/types.rs
View file

@ -291,6 +291,18 @@ impl AbilitySet {
}
}
impl FromIterator<Symbol> for AbilitySet {
fn from_iter<T: IntoIterator<Item = Symbol>>(iter: T) -> Self {
let iter = iter.into_iter();
let (lo, hi) = iter.size_hint();
let mut this = Self::with_capacity(hi.unwrap_or(lo));
for item in iter {
this.insert(item);
}
this
}
}
#[derive(Clone, Debug)]
pub struct OptAbleVar {
pub var: Variable,