Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors

Browse source
This commit is contained in:
Antonio Scandurra 2023-01-18 13:53:48 +01:00
parent a653e87658
commit 8ca0f9ac99
3 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/collab/src/tests/randomized_integration_tests.rs
View file

@ -410,10 +410,10 @@ async fn test_random_collaboration(
guest_buffer.read_with(client_cx, |b, _| b.saved_version().clone()); guest_buffer.read_with(client_cx, |b, _| b.saved_version().clone());
assert_eq!(guest_saved_version, host_saved_version); assert_eq!(guest_saved_version, host_saved_version);
let host_saved_version_fingerprint = host_buffer let host_saved_version_fingerprint =
.read_with(host_cx, |b, _| b.saved_version_fingerprint().to_string()); host_buffer.read_with(host_cx, |b, _| b.saved_version_fingerprint());
let guest_saved_version_fingerprint = guest_buffer let guest_saved_version_fingerprint =
.read_with(client_cx, |b, _| b.saved_version_fingerprint().to_string()); guest_buffer.read_with(client_cx, |b, _| b.saved_version_fingerprint());
assert_eq!( assert_eq!(
guest_saved_version_fingerprint, guest_saved_version_fingerprint,
host_saved_version_fingerprint host_saved_version_fingerprint

12
crates/editor/src/items.rs
View file

@ -13,8 +13,10 @@ use gpui::{
elements::*, geometry::vector::vec2f, AppContext, Entity, ModelHandle, MutableAppContext, elements::*, geometry::vector::vec2f, AppContext, Entity, ModelHandle, MutableAppContext,
RenderContext, Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle, RenderContext, Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle,
}; };
use language::proto::serialize_anchor as serialize_text_anchor; use language::{
use language::{Bias, Buffer, File as _, OffsetRangeExt, Point, SelectionGoal}; proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, File as _, OffsetRangeExt,
Point, SelectionGoal,
};
use project::{File, FormatTrigger, Project, ProjectEntryId, ProjectPath}; use project::{File, FormatTrigger, Project, ProjectEntryId, ProjectPath};
use rpc::proto::{self, update_view}; use rpc::proto::{self, update_view};
use settings::Settings; use settings::Settings;
@ -1165,9 +1167,11 @@ fn path_for_file<'a>(
mod tests { mod tests {
use super::*; use super::*;
use gpui::MutableAppContext; use gpui::MutableAppContext;
use language::RopeFingerprint;
use std::{ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc, sync::Arc,
time::SystemTime,
}; };
#[gpui::test] #[gpui::test]
@ -1197,7 +1201,7 @@ mod tests {
todo!() todo!()
} }
fn mtime(&self) -> std::time::SystemTime { fn mtime(&self) -> SystemTime {
todo!() todo!()
} }
@ -1216,7 +1220,7 @@ mod tests {
_: clock::Global, _: clock::Global,
_: project::LineEnding, _: project::LineEnding,
_: &mut MutableAppContext, _: &mut MutableAppContext,
) -> gpui::Task<anyhow::Result<(clock::Global, String, std::time::SystemTime)>> { ) -> gpui::Task<anyhow::Result<(clock::Global, RopeFingerprint, SystemTime)>> {
todo!() todo!()
} }

19
crates/project/src/worktree.rs
View file

@ -20,10 +20,12 @@ use gpui::{
executor, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext, executor, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext,
Task, Task,
}; };
use language::Unclipped;
use language::{ use language::{
proto::{deserialize_version, serialize_line_ending, serialize_version}, proto::{
Buffer, DiagnosticEntry, PointUtf16, Rope, deserialize_fingerprint, deserialize_version, serialize_fingerprint, serialize_line_ending,
serialize_version,
},
Buffer, DiagnosticEntry, PointUtf16, Rope, RopeFingerprint, Unclipped,
}; };
use parking_lot::Mutex; use parking_lot::Mutex;
use postage::{ use postage::{
@ -1863,7 +1865,7 @@ impl language::File for File {
version: clock::Global, version: clock::Global,
line_ending: LineEnding, line_ending: LineEnding,
cx: &mut MutableAppContext, cx: &mut MutableAppContext,
) -> Task<Result<(clock::Global, String, SystemTime)>> { ) -> Task<Result<(clock::Global, RopeFingerprint, SystemTime)>> {
self.worktree.update(cx, |worktree, cx| match worktree { self.worktree.update(cx, |worktree, cx| match worktree {
Worktree::Local(worktree) => { Worktree::Local(worktree) => {
let rpc = worktree.client.clone(); let rpc = worktree.client.clone();
@ -1878,7 +1880,7 @@ impl language::File for File {
buffer_id, buffer_id,
version: serialize_version(&version), version: serialize_version(&version),
mtime: Some(entry.mtime.into()), mtime: Some(entry.mtime.into()),
fingerprint: fingerprint.clone(), fingerprint: serialize_fingerprint(fingerprint),
})?; })?;
} }
Ok((version, fingerprint, entry.mtime)) Ok((version, fingerprint, entry.mtime))
@ -1896,11 +1898,12 @@ impl language::File for File {
}) })
.await?; .await?;
let version = deserialize_version(response.version); let version = deserialize_version(response.version);
let fingerprint = deserialize_fingerprint(&response.fingerprint)?;
let mtime = response let mtime = response
.mtime .mtime
.ok_or_else(|| anyhow!("missing mtime"))? .ok_or_else(|| anyhow!("missing mtime"))?
.into(); .into();
Ok((version, response.fingerprint, mtime)) Ok((version, fingerprint, mtime))
}) })
} }
}) })
@ -1943,7 +1946,7 @@ impl language::LocalFile for File {
&self, &self,
buffer_id: u64, buffer_id: u64,
version: &clock::Global, version: &clock::Global,
fingerprint: String, fingerprint: RopeFingerprint,
line_ending: LineEnding, line_ending: LineEnding,
mtime: SystemTime, mtime: SystemTime,
cx: &mut MutableAppContext, cx: &mut MutableAppContext,
@ -1957,7 +1960,7 @@ impl language::LocalFile for File {
buffer_id, buffer_id,
version: serialize_version(version), version: serialize_version(version),
mtime: Some(mtime.into()), mtime: Some(mtime.into()),
fingerprint, fingerprint: serialize_fingerprint(fingerprint),
line_ending: serialize_line_ending(line_ending) as i32, line_ending: serialize_line_ending(line_ending) as i32,
}) })
.log_err(); .log_err();