@@ -7,17 +7,31 @@ const THEME_PREVIEW_FILE: &[u8] = include_bytes!("../assets/theme_preview.rs");
77
88pub struct InputFileReader<'a> {
99 inner: Box<dyn BufRead + 'a>,
10+ buffer: Vec<u8>,
1011}
1112
1213impl<'a> InputFileReader<'a> {
1314 fn new<R: BufRead + 'a>(reader: R) -> InputFileReader<'a> {
1415 InputFileReader {
1516 inner: Box::new(reader),
17+ buffer: vec![],
1618 }
1719 }
1820
21+ pub fn get_first_line(&mut self) -> io::Result<Vec<u8>> {
22+ assert!(self.buffer.is_empty());
23+
24+ self.inner.read_until(b'\n', &mut self.buffer)?;
25+ Ok(self.buffer.clone())
26+ }
27+
1928 pub fn read_line(&mut self, buf: &mut Vec<u8>) -> io::Result<bool> {
20− self.inner.read_until(b'\n', buf).map(|size| size > 0)
29+ if self.buffer.is_empty() {
30+ self.inner.read_until(b'\n', buf).map(|size| size > 0)
31+ } else {
32+ buf.append(&mut self.buffer);
33+ return Ok(true);
34+ }
2135 }
2236}
2337
@@ -48,22 +62,26 @@ impl<'a> InputFile<'a> {
4862
4963#[test]
5064fn basic() {
51− let content = b"hello\nworld";
65+ let content = b"#!/bin/bash\necho hello";
5266 let mut reader = InputFileReader::new(&content[..]);
5367
68+ let first_line = reader.get_first_line();
69+ assert!(first_line.is_ok());
70+ assert_eq!(b"#!/bin/bash\n", &first_line.unwrap()[..]);
71+
5472 let mut buffer = vec![];
5573
5674 let res = reader.read_line(&mut buffer);
5775 assert!(res.is_ok());
5876 assert_eq!(true, res.unwrap());
59− assert_eq!(b"hello\n", &buffer[..]);
77+ assert_eq!(b"#!/bin/bash\n", &buffer[..]);
6078
6179 buffer.clear();
6280
6381 let res = reader.read_line(&mut buffer);
6482 assert!(res.is_ok());
6583 assert_eq!(true, res.unwrap());
66− assert_eq!(b"world", &buffer[..]);
84+ assert_eq!(b"echo hello", &buffer[..]);
6785
6886 buffer.clear();
6987