navigine/hexyl
1
0 Fork 0
mirror of https://github.com/sharkdp/hexyl.git synced 2026-10-30 09:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alter newline usage

Browse Source
This commit is contained in:
Sharif Haason authored and David Peter committed 2022-11-13 22:15:41 +01:00
1 parent 15e8abfc9a
commit 75d612ff11
1 file changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+9 -9
View File
@@ -391,11 +391,12 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
Squeezer::Print | Squeezer::Delete => self.writer.write_all(b" ")?, Squeezer::Print | Squeezer::Delete => self.writer.write_all(b" ")?,
Squeezer::Ignore | Squeezer::Disabled => { Squeezer::Ignore | Squeezer::Disabled => {
if let Some(&b) = self.line_buf.get(i as usize) { if let Some(&b) = self.line_buf.get(i as usize) {
self.writer.write_all(self.byte_char_panel[b as usize].as_bytes())?; self.writer
.write_all(self.byte_char_panel[b as usize].as_bytes())?;
} else { } else {
self.squeezer = Squeezer::Print; self.squeezer = Squeezer::Print;
} }
}, }
} }
if i == 8 * self.panels - 1 { if i == 8 * self.panels - 1 {
self.writer.write_all( self.writer.write_all(
@@ -404,7 +405,6 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
.encode_utf8(&mut [0; 4]) .encode_utf8(&mut [0; 4])
.as_bytes(), .as_bytes(),
)?; )?;
self.writer.write_all(b"\n")?;
} else if i % 8 == 7 { } else if i % 8 == 7 {
self.writer.write_all( self.writer.write_all(
self.border_style self.border_style
@@ -461,10 +461,6 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
self.print_header()?; self.print_header()?;
loop { loop {
if let Err(e) = buf.read_exact(&mut self.line_buf) { if let Err(e) = buf.read_exact(&mut self.line_buf) {
// self.print_position_panel()?;
// self.print_bytes()?;
// self.print_char_panel()?;
// self.writer.write_all(b"UENXPEC")?;
if e.kind() == ErrorKind::UnexpectedEof { if e.kind() == ErrorKind::UnexpectedEof {
break; break;
} }
@@ -472,7 +468,9 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
is_empty = false; is_empty = false;
if matches!(self.squeezer, Squeezer::Print | Squeezer::Delete) { if matches!(self.squeezer, Squeezer::Print | Squeezer::Delete) {
if self.line_buf[0] == self.squeeze_byte && self.line_buf.windows(2).all(|w| w[0] == w[1]) { if self.line_buf[0] == self.squeeze_byte
&& self.line_buf.windows(2).all(|w| w[0] == w[1])
{
if self.squeezer == Squeezer::Print { if self.squeezer == Squeezer::Print {
will_delete = true; will_delete = true;
} else { } else {
@@ -490,8 +488,10 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
if self.show_char_panel { if self.show_char_panel {
self.print_char_panel()?; self.print_char_panel()?;
} }
self.idx += 8 * self.panels; self.writer.write_all(b"\n")?;
self.idx += 8 * self.panels;
if will_delete { if will_delete {
self.squeezer = Squeezer::Delete; self.squeezer = Squeezer::Delete;
will_delete = false; will_delete = false;