Skip to content

Commit 71cfd8b

Browse files
authored
Merge pull request #111 from 7df-lab/dev/fix_bugs_0622
Dev/fix bugs 0622
2 parents 0db0109 + bf96fe7 commit 71cfd8b

26 files changed

Lines changed: 2860 additions & 2443 deletions

crates/client/src/acp_fs.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use devo_protocol::ACP_FS_WRITE_TEXT_FILE_METHOD;
55
use devo_protocol::AcpFsReadTextFileParams;
66
use devo_protocol::AcpFsReadTextFileResult;
77
use devo_protocol::AcpFsWriteTextFileParams;
8-
use devo_protocol::AcpSuccessResponse;
8+
use devo_protocol::acp_success_response;
99

1010
pub(crate) async fn handle_acp_fs_request(
1111
request_id: serde_json::Value,
@@ -17,7 +17,7 @@ pub(crate) async fn handle_acp_fs_request(
1717
let params = serde_json::from_value::<AcpFsReadTextFileParams>(params)
1818
.map_err(|error| format!("invalid fs/read_text_file params: {error}"))?;
1919
let content = read_acp_text_file(&params.path, params.line, params.limit).await?;
20-
Ok(acp_fs_success_response(
20+
Ok(acp_success_response(
2121
request_id,
2222
AcpFsReadTextFileResult {
2323
content,
@@ -29,7 +29,7 @@ pub(crate) async fn handle_acp_fs_request(
2929
let params = serde_json::from_value::<AcpFsWriteTextFileParams>(params)
3030
.map_err(|error| format!("invalid fs/write_text_file params: {error}"))?;
3131
write_acp_text_file(&params.path, params.content).await?;
32-
Ok(acp_fs_success_response(request_id, serde_json::Value::Null))
32+
Ok(acp_success_response(request_id, serde_json::Value::Null))
3333
}
3434
_ => Err(format!("unknown ACP filesystem method {method}")),
3535
}
@@ -82,20 +82,13 @@ fn select_text_lines(
8282
Ok(selected)
8383
}
8484

85-
fn acp_fs_success_response<T: serde::Serialize>(
86-
id: serde_json::Value,
87-
result: T,
88-
) -> serde_json::Value {
89-
serde_json::to_value(AcpSuccessResponse::new(id, result))
90-
.expect("serialize ACP filesystem success response")
91-
}
92-
9385
#[cfg(test)]
9486
mod tests {
9587
use std::path::PathBuf;
9688
use std::sync::atomic::AtomicU64;
9789
use std::sync::atomic::Ordering;
9890

91+
use devo_protocol::AcpSuccessResponse;
9992
use pretty_assertions::assert_eq;
10093

10194
use super::*;

0 commit comments

Comments
 (0)