Skip to content

Commit d09b545

Browse files
[autofix.ci] apply automated fixes
1 parent 876c91f commit d09b545

3 files changed

Lines changed: 69 additions & 12 deletions

File tree

crates/forge_app/src/infra.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ pub trait FileReaderInfra: Send + Sync {
7979
/// - FileInfo.end_line: ending line position
8080
/// - FileInfo.total_lines: total line count in file
8181
/// - FileInfo.content_hash: SHA-256 hash of the **full** file content,
82-
/// allowing callers to store a stable hash that matches what a
83-
/// whole-file read produces (used by the external-change detector)
82+
/// allowing callers to store a stable hash that matches what a whole-file
83+
/// read produces (used by the external-change detector)
8484
async fn range_read_utf8(
8585
&self,
8686
path: &Path,

crates/forge_fs/src/read_range.rs

Lines changed: 66 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ impl crate::ForgeFS {
8484
// Calculate actual end line (1-based) that was used
8585
let actual_end_line = cmp::min(end_line, total_lines);
8686

87-
let info = FileInfo::new(start_line, actual_end_line, total_lines).content_hash(content_hash);
87+
let info =
88+
FileInfo::new(start_line, actual_end_line, total_lines).content_hash(content_hash);
8889

8990
// Extract requested lines
9091
let result_content = if start_pos == 0 && end_pos == total_lines - 1 {
@@ -216,31 +217,66 @@ mod test {
216217
let (actual_content, actual_info) =
217218
crate::ForgeFS::read_range_utf8(file.path(), 1, 5).await?;
218219
assert_eq!(actual_content, content);
219-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (1, 5, 5));
220+
assert_eq!(
221+
(
222+
actual_info.start_line,
223+
actual_info.end_line,
224+
actual_info.total_lines
225+
),
226+
(1, 5, 5)
227+
);
220228

221229
// Test: end_line = total_lines + 1 (one beyond)
222230
let (actual_content, actual_info) =
223231
crate::ForgeFS::read_range_utf8(file.path(), 1, 6).await?;
224232
assert_eq!(actual_content, content);
225-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (1, 5, 5));
233+
assert_eq!(
234+
(
235+
actual_info.start_line,
236+
actual_info.end_line,
237+
actual_info.total_lines
238+
),
239+
(1, 5, 5)
240+
);
226241

227242
// Test: end_line >> total_lines (far beyond)
228243
let (actual_content, actual_info) =
229244
crate::ForgeFS::read_range_utf8(file.path(), 1, 10000).await?;
230245
assert_eq!(actual_content, content);
231-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (1, 5, 5));
246+
assert_eq!(
247+
(
248+
actual_info.start_line,
249+
actual_info.end_line,
250+
actual_info.total_lines
251+
),
252+
(1, 5, 5)
253+
);
232254

233255
// Test: range starting in the middle with excessive end_line
234256
let (actual_content, actual_info) =
235257
crate::ForgeFS::read_range_utf8(file.path(), 3, 100).await?;
236258
assert_eq!(actual_content, "Line 3\nLine 4\nLine 5");
237-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (3, 5, 5));
259+
assert_eq!(
260+
(
261+
actual_info.start_line,
262+
actual_info.end_line,
263+
actual_info.total_lines
264+
),
265+
(3, 5, 5)
266+
);
238267

239268
// Test: reading last line with excessive end_line
240269
let (actual_content, actual_info) =
241270
crate::ForgeFS::read_range_utf8(file.path(), 5, 100).await?;
242271
assert_eq!(actual_content, "Line 5");
243-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (5, 5, 5));
272+
assert_eq!(
273+
(
274+
actual_info.start_line,
275+
actual_info.end_line,
276+
actual_info.total_lines
277+
),
278+
(5, 5, 5)
279+
);
244280

245281
Ok(())
246282
}
@@ -256,19 +292,40 @@ mod test {
256292
let (actual_content, actual_info) =
257293
crate::ForgeFS::read_range_utf8(file.path(), 1, 50).await?;
258294
assert_eq!(actual_content.lines().count(), 50);
259-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (1, 50, 5000));
295+
assert_eq!(
296+
(
297+
actual_info.start_line,
298+
actual_info.end_line,
299+
actual_info.total_lines
300+
),
301+
(1, 50, 5000)
302+
);
260303

261304
// Test: range in the middle
262305
let (actual_content, actual_info) =
263306
crate::ForgeFS::read_range_utf8(file.path(), 2500, 3500).await?;
264307
assert_eq!(actual_content.lines().count(), 1001); // Lines 2500-3500 inclusive
265-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (2500, 3500, 5000));
308+
assert_eq!(
309+
(
310+
actual_info.start_line,
311+
actual_info.end_line,
312+
actual_info.total_lines
313+
),
314+
(2500, 3500, 5000)
315+
);
266316

267317
// Test: end beyond file bounds (simulates max_read_size limiting)
268318
let (actual_content, actual_info) =
269319
crate::ForgeFS::read_range_utf8(file.path(), 4990, 6000).await?;
270320
assert_eq!(actual_content.lines().count(), 11); // Lines 4990-5000
271-
assert_eq!((actual_info.start_line, actual_info.end_line, actual_info.total_lines), (4990, 5000, 5000));
321+
assert_eq!(
322+
(
323+
actual_info.start_line,
324+
actual_info.end_line,
325+
actual_info.total_lines
326+
),
327+
(4990, 5000, 5000)
328+
);
272329

273330
Ok(())
274331
}

crates/forge_services/src/attachment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<F: FileReaderInfra + EnvironmentInfra + FileInfoInfra + DirectoryReaderInfr
101101
content: file_content
102102
.to_numbered_from(file_info.start_line as usize)
103103
.to_string(),
104-
// FIXME: Can simply use FileInfo type directly instead of each field
104+
// FIXME: Can simply use FileInfo type directly instead of each field
105105
start_line: file_info.start_line,
106106
end_line: file_info.end_line,
107107
total_lines: file_info.total_lines,

0 commit comments

Comments
 (0)