1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
|
use crate::{
buffer::{Buffer, BufferID},
selection::Selection,
};
use std::collections::{HashMap, HashSet};
use std::path::PathBuf;
use thiserror::Error;
#[derive(Debug, Clone)]
pub enum StateChange {
ModifyBuffer {
buffer: BufferID,
old_start: usize,
old_end: usize,
old_content: String,
new_content: String,
},
CreateBuffer {
buffer: BufferID,
file: Option<PathBuf>,
},
DeleteBuffer {
buffer: BufferID,
},
}
#[derive(Error, Debug, Clone)]
pub enum GroupedChangeError {
#[error("Changes for buffer ID {buffer} overlap in regions {first:#?} and {second:#?}")]
OverlappingChanges {
buffer: BufferID,
first: (usize, usize),
second: (usize, usize),
},
#[error("Buffer ID {buffer} does not exist at time of processing")]
BufferNotLive { buffer: BufferID },
#[error("Buffer ID {buffer} already exists at time of processing")]
BufferAlreadyExists { buffer: BufferID },
#[error("Inconsistent final buffer set")]
InconsistentFinalBufferSet,
}
impl StateChange {
pub fn invert(&self) -> Option<Self> {
match self {
StateChange::ModifyBuffer {
buffer,
old_start,
old_content,
new_content,
..
} => {
let inversion_old_end = old_start + new_content.len();
Some(StateChange::ModifyBuffer {
buffer: *buffer,
old_start: *old_start,
old_end: inversion_old_end,
old_content: new_content.clone(),
new_content: old_content.clone(),
})
}
// TODO: Not supported?
StateChange::CreateBuffer { .. } => None,
StateChange::DeleteBuffer { .. } => None,
}
}
}
#[derive(Debug)]
pub struct EditorState {
pub current_buffer_id: BufferID,
current_selection: Selection,
buffers: HashMap<BufferID, Buffer>,
buffer_to_file: HashMap<BufferID, Option<PathBuf>>,
history: Vec<StateChange>,
next_buffer_id: BufferID,
}
impl EditorState {
pub fn new() -> Self {
Self {
current_buffer_id: 0,
current_selection: Selection::empty(),
buffers: HashMap::new(),
buffer_to_file: HashMap::new(),
history: Vec::new(),
next_buffer_id: 0,
}
}
pub fn create_buffer(
&mut self,
name: String,
content: String,
file: Option<PathBuf>,
) -> BufferID {
let buffer_id = self.next_buffer_id;
self.next_buffer_id += 1;
let buffer = Buffer::new(name, content);
self.buffers.insert(buffer_id, buffer);
self.buffer_to_file.insert(buffer_id, file.clone());
self.commit(StateChange::CreateBuffer {
buffer: buffer_id,
file,
});
buffer_id
}
pub fn current_buffer(&self) -> Option<&Buffer> {
self.buffers.get(&self.current_buffer_id)
}
pub fn get_buffer(&self, buffer_id: BufferID) -> Option<&Buffer> {
self.buffers.get(&buffer_id)
}
pub fn commit(&mut self, change: StateChange) {
match &change {
StateChange::ModifyBuffer {
buffer,
old_start,
old_end,
new_content,
..
} => {
if let Some(buf) = self.buffers.get_mut(buffer) {
buf.content = format!(
"{}{}{}",
&buf.content[..*old_start],
new_content,
&buf.content[*old_end..]
);
}
}
StateChange::CreateBuffer { buffer, file } => {
// TODO: do we want this?
if !self.buffer_to_file.contains_key(buffer) {
self.buffer_to_file.insert(*buffer, file.clone());
}
}
StateChange::DeleteBuffer { buffer } => {
self.buffers.remove(buffer);
self.buffer_to_file.remove(buffer);
}
}
self.history.push(change);
}
pub fn commit_changes(&mut self, changes: Vec<StateChange>) {
for change in changes {
self.commit(change);
}
}
pub fn validate_grouped_changes(
&self,
arms: &Vec<Vec<StateChange>>,
) -> Result<(), GroupedChangeError> {
let initial_buffers: std::collections::HashSet<BufferID> =
self.buffers.keys().copied().collect();
self.validate_arms_buffer_liveness(arms, &initial_buffers)?;
let all_modifications: Vec<&StateChange> = arms
.iter()
.flat_map(|arm| arm.iter())
.filter(|c| matches!(c, StateChange::ModifyBuffer { .. }))
.collect();
Self::validate_modifications(&all_modifications)?;
Ok(())
}
pub fn commit_changes_grouped(
&mut self,
arms: Vec<Vec<StateChange>>,
) -> Result<(), GroupedChangeError> {
self.validate_grouped_changes(&arms)?;
let all_changes: Vec<StateChange> = arms.into_iter().flatten().collect();
let mut creates = Vec::new();
let mut modifies: HashMap<BufferID, Vec<StateChange>> = HashMap::new();
let mut deletes = Vec::new();
let mut deleted_buffers = HashSet::new();
for change in all_changes {
match &change {
StateChange::CreateBuffer { .. } => creates.push(change),
StateChange::ModifyBuffer { buffer, .. } => {
modifies.entry(*buffer).or_default().push(change);
}
StateChange::DeleteBuffer { buffer } => {
deleted_buffers.insert(*buffer);
deletes.push(change);
}
}
}
for change in creates {
if let StateChange::CreateBuffer { buffer, .. } = &change {
if !deleted_buffers.contains(buffer) {
self.commit(change);
}
}
}
for (buffer_id, buffer_modifies) in modifies {
if !deleted_buffers.contains(&buffer_id) {
let merged = Self::merge_for_buffer(buffer_modifies);
for change in merged.into_iter().rev() {
self.commit(change);
}
}
}
for change in deletes {
self.commit(change);
}
Ok(())
}
fn validate_arms_buffer_liveness(
&self,
arms: &[Vec<StateChange>],
initial_buffers: &HashSet<BufferID>,
) -> Result<(), GroupedChangeError> {
// TODO: make this even smarter, currently it can't prove the consistency of one arm
// deleting a pre-existing buffer and the others _not touching it_.
let mut final_sets = Vec::new();
for arm in arms {
let mut live_buffers = initial_buffers.clone();
for change in arm {
match change {
StateChange::CreateBuffer { buffer, .. } => {
if !live_buffers.insert(*buffer) {
return Err(GroupedChangeError::BufferAlreadyExists {
buffer: *buffer,
});
}
}
StateChange::DeleteBuffer { buffer } => {
if !live_buffers.remove(buffer) {
return Err(GroupedChangeError::BufferNotLive { buffer: *buffer });
}
}
StateChange::ModifyBuffer { buffer, .. } => {
if !live_buffers.contains(buffer) {
return Err(GroupedChangeError::BufferNotLive { buffer: *buffer });
}
}
}
}
final_sets.push(live_buffers);
}
if final_sets.len() > 1 {
let first = &final_sets[0];
if !final_sets.iter().all(|set| set == first) {
return Err(GroupedChangeError::InconsistentFinalBufferSet);
}
}
Ok(())
}
fn validate_modifications(modifications: &[&StateChange]) -> Result<(), GroupedChangeError> {
let mut by_buffer: HashMap<BufferID, Vec<(usize, usize)>> = HashMap::new();
for change in modifications {
if let StateChange::ModifyBuffer {
buffer,
old_start,
old_end,
..
} = change
{
by_buffer
.entry(*buffer)
.or_default()
.push((*old_start, *old_end));
}
}
for (buffer_id, mut ranges) in by_buffer {
ranges.sort_unstable();
for window in ranges.windows(2) {
let (prev_start, prev_end) = window[0];
let (curr_start, curr_end) = window[1];
if curr_start < prev_end {
return Err(GroupedChangeError::OverlappingChanges {
buffer: buffer_id,
first: (prev_start, prev_end),
second: (curr_start, curr_end),
});
}
}
}
Ok(())
}
fn merge_for_buffer(changes: Vec<StateChange>) -> Vec<StateChange> {
let mut sorted = changes;
sorted.sort_by_key(|c| match c {
StateChange::ModifyBuffer { old_start, .. } => *old_start,
_ => 0,
});
let mut result = Vec::new();
let mut current_merge: Option<(BufferID, usize, String)> = None;
for change in sorted {
if let StateChange::ModifyBuffer {
buffer,
old_start,
old_end,
new_content,
..
} = &change
{
if old_start == old_end {
match &mut current_merge {
Some((buf, pos, content)) if *buf == *buffer && *pos == *old_start => {
content.push_str(new_content);
}
Some((buf, pos, content)) => {
result.push(StateChange::ModifyBuffer {
buffer: *buf,
old_start: *pos,
old_end: *pos,
old_content: String::new(),
new_content: content.clone(),
});
current_merge = Some((*buffer, *old_start, new_content.clone()));
}
None => {
current_merge = Some((*buffer, *old_start, new_content.clone()));
}
}
} else {
if let Some((buf, pos, content)) = current_merge.take() {
result.push(StateChange::ModifyBuffer {
buffer: buf,
old_start: pos,
old_end: pos,
old_content: String::new(),
new_content: content,
});
}
result.push(change);
}
}
}
if let Some((buf, pos, content)) = current_merge {
result.push(StateChange::ModifyBuffer {
buffer: buf,
old_start: pos,
old_end: pos,
old_content: String::new(),
new_content: content,
});
}
result
}
}
pub type StateResult = (Selection, Vec<StateChange>);
|