2021-11-01 21:05:19 +00:00
|
|
|
use std::sync::Arc;
|
|
|
|
|
2021-12-09 15:38:46 +00:00
|
|
|
use crate::{diagnostic_set::DiagnosticEntry, Diagnostic, Operation};
|
2021-11-01 21:05:19 +00:00
|
|
|
use anyhow::{anyhow, Result};
|
|
|
|
use clock::ReplicaId;
|
2021-11-01 22:28:37 +00:00
|
|
|
use lsp::DiagnosticSeverity;
|
2021-11-01 21:05:19 +00:00
|
|
|
use rpc::proto;
|
2021-11-30 19:26:12 +00:00
|
|
|
use text::*;
|
2021-11-01 21:05:19 +00:00
|
|
|
|
|
|
|
pub use proto::Buffer;
|
|
|
|
|
|
|
|
pub fn serialize_operation(operation: &Operation) -> proto::Operation {
|
|
|
|
proto::Operation {
|
|
|
|
variant: Some(match operation {
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::Edit(edit)) => {
|
2021-11-01 21:05:19 +00:00
|
|
|
proto::operation::Variant::Edit(serialize_edit_operation(edit))
|
|
|
|
}
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::Undo {
|
2021-11-01 21:05:19 +00:00
|
|
|
undo,
|
|
|
|
lamport_timestamp,
|
2021-11-01 22:28:37 +00:00
|
|
|
}) => proto::operation::Variant::Undo(proto::operation::Undo {
|
2021-11-01 21:05:19 +00:00
|
|
|
replica_id: undo.id.replica_id as u32,
|
|
|
|
local_timestamp: undo.id.value,
|
|
|
|
lamport_timestamp: lamport_timestamp.value,
|
|
|
|
ranges: undo
|
|
|
|
.ranges
|
|
|
|
.iter()
|
|
|
|
.map(|r| proto::Range {
|
|
|
|
start: r.start.0 as u64,
|
|
|
|
end: r.end.0 as u64,
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
counts: undo
|
|
|
|
.counts
|
|
|
|
.iter()
|
|
|
|
.map(|(edit_id, count)| proto::operation::UndoCount {
|
|
|
|
replica_id: edit_id.replica_id as u32,
|
|
|
|
local_timestamp: edit_id.value,
|
|
|
|
count: *count,
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
version: From::from(&undo.version),
|
|
|
|
}),
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::UpdateSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
set_id,
|
|
|
|
selections,
|
|
|
|
lamport_timestamp,
|
2021-11-01 22:28:37 +00:00
|
|
|
}) => proto::operation::Variant::UpdateSelections(proto::operation::UpdateSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
replica_id: set_id.replica_id as u32,
|
|
|
|
local_timestamp: set_id.value,
|
|
|
|
lamport_timestamp: lamport_timestamp.value,
|
|
|
|
selections: selections
|
2021-12-09 15:38:46 +00:00
|
|
|
.iter()
|
|
|
|
.map(|selection| proto::Selection {
|
|
|
|
id: selection.id as u64,
|
|
|
|
start: Some(serialize_anchor(&selection.start)),
|
|
|
|
end: Some(serialize_anchor(&selection.end)),
|
|
|
|
reversed: selection.reversed,
|
2021-11-01 21:05:19 +00:00
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
}),
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::RemoveSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
set_id,
|
|
|
|
lamport_timestamp,
|
2021-11-01 22:28:37 +00:00
|
|
|
}) => proto::operation::Variant::RemoveSelections(proto::operation::RemoveSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
replica_id: set_id.replica_id as u32,
|
|
|
|
local_timestamp: set_id.value,
|
|
|
|
lamport_timestamp: lamport_timestamp.value,
|
|
|
|
}),
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::SetActiveSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
set_id,
|
|
|
|
lamport_timestamp,
|
2021-11-01 22:28:37 +00:00
|
|
|
}) => proto::operation::Variant::SetActiveSelections(
|
2021-11-01 21:05:19 +00:00
|
|
|
proto::operation::SetActiveSelections {
|
|
|
|
replica_id: lamport_timestamp.replica_id as u32,
|
|
|
|
local_timestamp: set_id.map(|set_id| set_id.value),
|
|
|
|
lamport_timestamp: lamport_timestamp.value,
|
|
|
|
},
|
|
|
|
),
|
2021-12-09 15:38:46 +00:00
|
|
|
Operation::UpdateDiagnostics {
|
|
|
|
diagnostics,
|
|
|
|
lamport_timestamp,
|
|
|
|
} => proto::operation::Variant::UpdateDiagnostics(proto::UpdateDiagnostics {
|
|
|
|
replica_id: lamport_timestamp.replica_id as u32,
|
|
|
|
lamport_timestamp: lamport_timestamp.value,
|
|
|
|
diagnostics: serialize_diagnostics(diagnostics.iter()),
|
|
|
|
}),
|
2021-11-01 21:05:19 +00:00
|
|
|
}),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn serialize_edit_operation(operation: &EditOperation) -> proto::operation::Edit {
|
|
|
|
let ranges = operation
|
|
|
|
.ranges
|
|
|
|
.iter()
|
|
|
|
.map(|range| proto::Range {
|
|
|
|
start: range.start.0 as u64,
|
|
|
|
end: range.end.0 as u64,
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
proto::operation::Edit {
|
|
|
|
replica_id: operation.timestamp.replica_id as u32,
|
|
|
|
local_timestamp: operation.timestamp.local,
|
|
|
|
lamport_timestamp: operation.timestamp.lamport,
|
|
|
|
version: From::from(&operation.version),
|
|
|
|
ranges,
|
|
|
|
new_text: operation.new_text.clone(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn serialize_selection_set(set: &SelectionSet) -> proto::SelectionSet {
|
|
|
|
proto::SelectionSet {
|
|
|
|
replica_id: set.id.replica_id as u32,
|
|
|
|
lamport_timestamp: set.id.value as u32,
|
|
|
|
is_active: set.active,
|
2021-12-09 15:38:46 +00:00
|
|
|
selections: set
|
|
|
|
.selections
|
|
|
|
.iter()
|
|
|
|
.map(|selection| proto::Selection {
|
|
|
|
id: selection.id as u64,
|
|
|
|
start: Some(serialize_anchor(&selection.start)),
|
|
|
|
end: Some(serialize_anchor(&selection.end)),
|
|
|
|
reversed: selection.reversed,
|
2021-11-01 21:05:19 +00:00
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-09 15:38:46 +00:00
|
|
|
pub fn serialize_diagnostics<'a>(
|
2021-12-09 16:53:08 +00:00
|
|
|
diagnostics: impl IntoIterator<Item = &'a DiagnosticEntry<Anchor>>,
|
2021-12-09 15:38:46 +00:00
|
|
|
) -> Vec<proto::Diagnostic> {
|
|
|
|
diagnostics
|
|
|
|
.into_iter()
|
|
|
|
.map(|entry| proto::Diagnostic {
|
|
|
|
start: Some(serialize_anchor(&entry.range.start)),
|
|
|
|
end: Some(serialize_anchor(&entry.range.end)),
|
|
|
|
message: entry.diagnostic.message.clone(),
|
|
|
|
severity: match entry.diagnostic.severity {
|
|
|
|
DiagnosticSeverity::ERROR => proto::diagnostic::Severity::Error,
|
|
|
|
DiagnosticSeverity::WARNING => proto::diagnostic::Severity::Warning,
|
|
|
|
DiagnosticSeverity::INFORMATION => proto::diagnostic::Severity::Information,
|
|
|
|
DiagnosticSeverity::HINT => proto::diagnostic::Severity::Hint,
|
|
|
|
_ => proto::diagnostic::Severity::None,
|
|
|
|
} as i32,
|
|
|
|
group_id: entry.diagnostic.group_id as u64,
|
|
|
|
is_primary: entry.diagnostic.is_primary,
|
|
|
|
})
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn serialize_anchor(anchor: &Anchor) -> proto::Anchor {
|
|
|
|
proto::Anchor {
|
|
|
|
replica_id: anchor.timestamp.replica_id as u32,
|
|
|
|
local_timestamp: anchor.timestamp.value,
|
|
|
|
offset: anchor.offset as u64,
|
|
|
|
bias: match anchor.bias {
|
|
|
|
Bias::Left => proto::Bias::Left as i32,
|
|
|
|
Bias::Right => proto::Bias::Right as i32,
|
|
|
|
},
|
2021-11-01 22:28:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-11-01 21:05:19 +00:00
|
|
|
pub fn deserialize_operation(message: proto::Operation) -> Result<Operation> {
|
|
|
|
Ok(
|
|
|
|
match message
|
|
|
|
.variant
|
|
|
|
.ok_or_else(|| anyhow!("missing operation variant"))?
|
|
|
|
{
|
|
|
|
proto::operation::Variant::Edit(edit) => {
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::Edit(deserialize_edit_operation(edit)))
|
2021-11-01 21:05:19 +00:00
|
|
|
}
|
2021-11-30 19:26:12 +00:00
|
|
|
proto::operation::Variant::Undo(undo) => Operation::Buffer(text::Operation::Undo {
|
2021-11-01 21:05:19 +00:00
|
|
|
lamport_timestamp: clock::Lamport {
|
|
|
|
replica_id: undo.replica_id as ReplicaId,
|
|
|
|
value: undo.lamport_timestamp,
|
|
|
|
},
|
|
|
|
undo: UndoOperation {
|
|
|
|
id: clock::Local {
|
|
|
|
replica_id: undo.replica_id as ReplicaId,
|
|
|
|
value: undo.local_timestamp,
|
|
|
|
},
|
|
|
|
counts: undo
|
|
|
|
.counts
|
|
|
|
.into_iter()
|
|
|
|
.map(|c| {
|
|
|
|
(
|
|
|
|
clock::Local {
|
|
|
|
replica_id: c.replica_id as ReplicaId,
|
|
|
|
value: c.local_timestamp,
|
|
|
|
},
|
|
|
|
c.count,
|
|
|
|
)
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
ranges: undo
|
|
|
|
.ranges
|
|
|
|
.into_iter()
|
|
|
|
.map(|r| FullOffset(r.start as usize)..FullOffset(r.end as usize))
|
|
|
|
.collect(),
|
|
|
|
version: undo.version.into(),
|
|
|
|
},
|
2021-11-01 22:28:37 +00:00
|
|
|
}),
|
2021-11-01 21:05:19 +00:00
|
|
|
proto::operation::Variant::UpdateSelections(message) => {
|
2021-12-09 15:38:46 +00:00
|
|
|
let selections = message
|
2021-11-01 21:05:19 +00:00
|
|
|
.selections
|
2021-12-09 15:38:46 +00:00
|
|
|
.into_iter()
|
|
|
|
.filter_map(|selection| {
|
|
|
|
Some(Selection {
|
2021-11-01 21:05:19 +00:00
|
|
|
id: selection.id as usize,
|
2021-12-09 15:38:46 +00:00
|
|
|
start: deserialize_anchor(selection.start?)?,
|
|
|
|
end: deserialize_anchor(selection.end?)?,
|
2021-11-01 21:05:19 +00:00
|
|
|
reversed: selection.reversed,
|
|
|
|
goal: SelectionGoal::None,
|
2021-12-09 15:38:46 +00:00
|
|
|
})
|
2021-11-01 21:05:19 +00:00
|
|
|
})
|
2021-12-09 15:38:46 +00:00
|
|
|
.collect::<Vec<_>>();
|
2021-11-01 21:05:19 +00:00
|
|
|
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::UpdateSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
set_id: clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value: message.local_timestamp,
|
|
|
|
},
|
|
|
|
lamport_timestamp: clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value: message.lamport_timestamp,
|
|
|
|
},
|
|
|
|
selections: Arc::from(selections),
|
2021-11-01 22:28:37 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
proto::operation::Variant::RemoveSelections(message) => {
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::RemoveSelections {
|
2021-11-01 22:28:37 +00:00
|
|
|
set_id: clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value: message.local_timestamp,
|
|
|
|
},
|
|
|
|
lamport_timestamp: clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value: message.lamport_timestamp,
|
|
|
|
},
|
|
|
|
})
|
2021-11-01 21:05:19 +00:00
|
|
|
}
|
|
|
|
proto::operation::Variant::SetActiveSelections(message) => {
|
2021-11-30 19:26:12 +00:00
|
|
|
Operation::Buffer(text::Operation::SetActiveSelections {
|
2021-11-01 21:05:19 +00:00
|
|
|
set_id: message.local_timestamp.map(|value| clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value,
|
|
|
|
}),
|
|
|
|
lamport_timestamp: clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value: message.lamport_timestamp,
|
|
|
|
},
|
2021-11-01 22:28:37 +00:00
|
|
|
})
|
|
|
|
}
|
2021-12-09 15:38:46 +00:00
|
|
|
proto::operation::Variant::UpdateDiagnostics(message) => Operation::UpdateDiagnostics {
|
|
|
|
diagnostics: Arc::from(deserialize_diagnostics(message.diagnostics)),
|
|
|
|
lamport_timestamp: clock::Lamport {
|
|
|
|
replica_id: message.replica_id as ReplicaId,
|
|
|
|
value: message.lamport_timestamp,
|
|
|
|
},
|
|
|
|
},
|
2021-11-01 21:05:19 +00:00
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn deserialize_edit_operation(edit: proto::operation::Edit) -> EditOperation {
|
|
|
|
let ranges = edit
|
|
|
|
.ranges
|
|
|
|
.into_iter()
|
|
|
|
.map(|range| FullOffset(range.start as usize)..FullOffset(range.end as usize))
|
|
|
|
.collect();
|
|
|
|
EditOperation {
|
|
|
|
timestamp: InsertionTimestamp {
|
|
|
|
replica_id: edit.replica_id as ReplicaId,
|
|
|
|
local: edit.local_timestamp,
|
|
|
|
lamport: edit.lamport_timestamp,
|
|
|
|
},
|
|
|
|
version: edit.version.into(),
|
|
|
|
ranges,
|
|
|
|
new_text: edit.new_text,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn deserialize_selection_set(set: proto::SelectionSet) -> SelectionSet {
|
|
|
|
SelectionSet {
|
|
|
|
id: clock::Lamport {
|
|
|
|
replica_id: set.replica_id as u16,
|
|
|
|
value: set.lamport_timestamp,
|
|
|
|
},
|
|
|
|
active: set.is_active,
|
2021-12-09 15:38:46 +00:00
|
|
|
selections: Arc::from(
|
2021-11-01 21:05:19 +00:00
|
|
|
set.selections
|
|
|
|
.into_iter()
|
2021-12-09 15:38:46 +00:00
|
|
|
.filter_map(|selection| {
|
|
|
|
Some(Selection {
|
2021-11-01 21:05:19 +00:00
|
|
|
id: selection.id as usize,
|
2021-12-09 15:38:46 +00:00
|
|
|
start: deserialize_anchor(selection.start?)?,
|
|
|
|
end: deserialize_anchor(selection.end?)?,
|
2021-11-01 21:05:19 +00:00
|
|
|
reversed: selection.reversed,
|
|
|
|
goal: SelectionGoal::None,
|
2021-12-09 15:38:46 +00:00
|
|
|
})
|
2021-11-01 21:05:19 +00:00
|
|
|
})
|
2021-12-09 15:38:46 +00:00
|
|
|
.collect::<Vec<_>>(),
|
|
|
|
),
|
2021-11-01 21:05:19 +00:00
|
|
|
}
|
|
|
|
}
|
2021-11-01 22:28:37 +00:00
|
|
|
|
2021-12-09 16:53:08 +00:00
|
|
|
pub fn deserialize_diagnostics(
|
|
|
|
diagnostics: Vec<proto::Diagnostic>,
|
|
|
|
) -> Vec<DiagnosticEntry<Anchor>> {
|
2021-12-09 15:38:46 +00:00
|
|
|
diagnostics
|
|
|
|
.into_iter()
|
|
|
|
.filter_map(|diagnostic| {
|
|
|
|
Some(DiagnosticEntry {
|
|
|
|
range: deserialize_anchor(diagnostic.start?)?..deserialize_anchor(diagnostic.end?)?,
|
|
|
|
diagnostic: Diagnostic {
|
2021-11-01 22:28:37 +00:00
|
|
|
severity: match proto::diagnostic::Severity::from_i32(diagnostic.severity)? {
|
|
|
|
proto::diagnostic::Severity::Error => DiagnosticSeverity::ERROR,
|
|
|
|
proto::diagnostic::Severity::Warning => DiagnosticSeverity::WARNING,
|
|
|
|
proto::diagnostic::Severity::Information => DiagnosticSeverity::INFORMATION,
|
|
|
|
proto::diagnostic::Severity::Hint => DiagnosticSeverity::HINT,
|
|
|
|
proto::diagnostic::Severity::None => return None,
|
|
|
|
},
|
|
|
|
message: diagnostic.message,
|
2021-11-04 13:52:34 +00:00
|
|
|
group_id: diagnostic.group_id as usize,
|
2021-11-18 14:53:00 +00:00
|
|
|
is_primary: diagnostic.is_primary,
|
2021-11-01 22:28:37 +00:00
|
|
|
},
|
2021-12-09 15:38:46 +00:00
|
|
|
})
|
|
|
|
})
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn deserialize_anchor(anchor: proto::Anchor) -> Option<Anchor> {
|
|
|
|
Some(Anchor {
|
|
|
|
timestamp: clock::Local {
|
|
|
|
replica_id: anchor.replica_id as ReplicaId,
|
|
|
|
value: anchor.local_timestamp,
|
|
|
|
},
|
|
|
|
offset: anchor.offset as usize,
|
|
|
|
bias: match proto::Bias::from_i32(anchor.bias)? {
|
|
|
|
proto::Bias::Left => Bias::Left,
|
|
|
|
proto::Bias::Right => Bias::Right,
|
|
|
|
},
|
|
|
|
})
|
2021-11-01 22:28:37 +00:00
|
|
|
}
|