Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zed-settings-sync-cli"
description = "A CLI tool for Zed editor settings-sync extension"
version = "0.1.0"
version = "0.1.1"
edition = "2024"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion extension.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id = "settings-sync"
name = "Settings Sync"
version = "0.1.0"
version = "0.1.1"
schema_version = 1
authors = ["Viktor Zahorodnii <post.vittorius@gmail.com>"]
description = "Never again be afraid of losing your precious Zed configuration"
Expand Down
2 changes: 1 addition & 1 deletion lsp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zed-settings-sync-lsp"
description = "An LSP server for Zed editor settings-sync extension"
version = "0.1.0"
version = "0.1.1"
edition = "2024"

[lints]
Expand Down
28 changes: 22 additions & 6 deletions lsp/src/watching/path_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,21 @@ impl PathStore {
return;
};

if let Err(err) = sync_client_clone.sync_file(data).await {
error!("Could not sync file: {err}");
lsp_client_clone
.show_message(MessageType::ERROR, err.to_string())
.await;
match sync_client_clone.sync_file(data).await {
Ok(()) => {
lsp_client_clone
.show_message(
MessageType::INFO,
"Successfully synced".to_owned(),
)
.await;
}
Err(err) => {
error!("Could not sync file: {err}");
lsp_client_clone
.show_message(MessageType::ERROR, err.to_string())
.await;
}
}
}
Err(err) => {
Expand Down Expand Up @@ -397,7 +407,13 @@ mod tests {
.return_once(|_| Ok(()));

let mut mock_lsp_client = MockLspClient::default();
mock_lsp_client.expect_show_message().never();
mock_lsp_client
.expect_show_message()
.with(
predicate::eq(MessageType::INFO),
predicate::eq("Successfully synced".to_owned()),
)
.return_once(|_msg_type, _msg| Box::pin(async {}));

PathStore::new(Arc::new(mock_sync_client), Arc::new(mock_lsp_client))?;

Expand Down
Loading