RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

Spreadsheet: Ignore extra empty lines after the rows

Browse source 
We now ignore the last CRLF in e.g.
```csv
aaa,bbb,ccc CRLF
zzz,yyy,xxx CRLF
```
This commit is contained in:
AnotherTest 2021-03-27 17:05:09 +04:30 • committed by Andreas Kling
parent 894bfa30a2
commit ccf84a4709
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Applications/Spreadsheet/Readers/XSV.cpp
View file

@ -71,6 +71,12 @@ void XSV::parse()
while (!has_error() && !m_lexer.is_eof()) while (!has_error() && !m_lexer.is_eof())
m_rows.append(read_row()); m_rows.append(read_row());
// Read and drop any extra lines at the end.
while (!m_lexer.is_eof()) {
if (!m_lexer.consume_specific("\r\n") && !m_lexer.consume_specific('\n'))
break;
}
if (!m_lexer.is_eof()) if (!m_lexer.is_eof())
set_error(ReadError::DataPastLogicalEnd); set_error(ReadError::DataPastLogicalEnd);
} }