public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/galaxy_files/src/text_file_reader.rs
+39 -37
View File
@@ -126,48 +126,50 @@ impl TextFileAccumulator {
}
}
/// Emits a [`TextFileSegment`] for the current range (if non-empty, or if
/// this is the final flush of a whole-file read) and resets per-range state.
/// Emits a [`TextFileSegment`] for the current range and resets per-range
/// state. Always produces a segment — even when the buffer is empty (e.g.
/// the requested range was entirely past EOF).
fn flush_range(&mut self, final_flush: bool) {
let should_emit = !self.buf.is_empty() || (final_flush && self.whole_file);
let range = self.effective_ranges[self.range_idx].clone();
let line_range = if self.whole_file && !self.truncated {
None
} else if self.truncated {
// `last_line` is the last line that was successfully buffered, or 0
// when the first in-range line already exceeded the byte budget (so
// nothing was buffered). Clamp to `range.start` so a truncated
// segment with no buffered lines yields an empty `start..start`
// range instead of a reversed `start..0`.
Some(range.start..self.last_line.max(range.start))
} else {
Some(range)
};
if should_emit {
let range = self.effective_ranges[self.range_idx].clone();
let line_range = if self.whole_file && !self.truncated {
None
} else if self.truncated {
Some(range.start..self.last_line)
} else {
Some(range)
};
self.total_bytes_read += self.buf_bytes;
let mut content = std::mem::take(&mut self.buf).join("\n");
self.total_bytes_read += self.buf_bytes;
let mut content = std::mem::take(&mut self.buf).join("\n");
// If this is the final flush of a non-truncated whole-file read
// and the last line in the file had a trailing newline, preserve
// it. This ensures round-tripping file content through the
// accumulator doesn't silently drop a trailing newline (which
// would otherwise cause data loss when the content is written
// back to disk, e.g. during remote diff application).
//
// We skip this for truncated reads (the content is incomplete, so
// appending a newline would be misleading) and for ranged reads
// (which extract a slice, not the full file).
if final_flush && self.whole_file && !self.truncated && self.last_line_had_newline {
content.push('\n');
self.total_bytes_read += 1;
}
self.segments.push(TextFileSegment {
file_name: self.file_name.clone(),
content,
line_range,
last_modified: self.last_modified,
line_count: 0, // Set in finalize()
});
// If this is the final flush of a non-truncated whole-file read
// and the last line in the file had a trailing newline, preserve
// it. This ensures round-tripping file content through the
// accumulator doesn't silently drop a trailing newline (which
// would otherwise cause data loss when the content is written
// back to disk, e.g. during remote diff application).
//
// We skip this for truncated reads (the content is incomplete, so
// appending a newline would be misleading) and for ranged reads
// (which extract a slice, not the full file).
if final_flush && self.whole_file && !self.truncated && self.last_line_had_newline {
content.push('\n');
self.total_bytes_read += 1;
}
self.segments.push(TextFileSegment {
file_name: self.file_name.clone(),
content,
line_range,
last_modified: self.last_modified,
line_count: 0, // Set in finalize()
});
self.buf.clear();
self.buf_bytes = 0;
self.truncated = false;