language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix def replace

Browse source
This commit is contained in:
Kiryl Dziamura 2024-07-06 23:39:31 +02:00
parent 8163de02f3
commit b2484f144c
No known key found for this signature in database
GPG key ID: FB539501A4561ACF
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/compiler/parse/src/ast.rs
View file

@ -1146,8 +1146,6 @@ impl<'a> ImportAlias<'a> {
#[derive(Debug, Clone, PartialEq, Default)]
pub struct Defs<'a> {
/// A collection of references by index to either `type_defs` or `value_defs`
/// It's an entry point for actual definitions, while `type_defs` and `value_defs` are append-only collections
pub tags: std::vec::Vec<EitherIndex<TypeDef<'a>, ValueDef<'a>>>,
pub regions: std::vec::Vec<Region>,
pub space_before: std::vec::Vec<Slice<CommentOrNewline<'a>>>,
@ -1227,29 +1225,25 @@ impl<'a> Defs<'a> {
.split()
{
Ok(type_index) => {
let index = type_index.index();
// remove from vec
self.type_defs.remove(index);
self.type_defs.remove(type_index.index());
// update all of the remaining indexes in type_defs
for (tag_index, tag) in self.tags.iter_mut().enumerate() {
for (current_tag_index, tag) in self.tags.iter_mut().enumerate() {
// only update later indexes into type_defs
if tag_index > index && tag.split().is_ok() {
if current_tag_index > tag_index && tag.split().is_ok() {
tag.decrement_index();
}
}
}
Err(value_index) => {
let index: usize = value_index.index();
// remove from vec
self.value_defs.remove(index);
self.value_defs.remove(value_index.index());
// update all of the remaining indexes in value_defs
for (tag_index, tag) in self.tags.iter_mut().enumerate() {
for (current_tag_index, tag) in self.tags.iter_mut().enumerate() {
// only update later indexes into value_defs
if tag_index > index && tag.split().is_err() {
if current_tag_index > tag_index && tag.split().is_err() {
tag.decrement_index();
}
}
@ -1292,18 +1286,23 @@ impl<'a> Defs<'a> {
self.push_def_help(tag, region, spaces_before, spaces_after)
}
/// Replace the `value_def` at the given index
/// Replace with `value_def` at the given index
pub fn replace_with_value_def(
&mut self,
index: usize,
tag_index: usize,
value_def: ValueDef<'a>,
region: Region,
) {
let value_def_index = Index::push_new(&mut self.value_defs, value_def);
let tag = EitherIndex::from_right(value_def_index);
self.tags[index] = tag;
self.regions[index] = region;
match self.tags[tag_index].split() {
Ok(_) => {
self.remove_tag(tag_index);
self.push_value_def(value_def, region, &[], &[]);
}
Err(value_index) => {
self.regions[tag_index] = region;
self.value_defs[value_index.index()] = value_def;
}
}
}
pub fn push_type_def(