xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::find when detecting end of line format

Browse Source
This commit is contained in:
Maxime Coste 2024-02-28 19:05:45 +11:00
parent 3d5a0c672e
commit 068af3d9d4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/buffer_utils.cc
View File

@ -132,13 +132,9 @@ decltype(auto) parse_file(StringView filename, Func&& func)
} }
bool has_crlf = false, has_lf = false; bool has_crlf = false, has_lf = false;
for (auto it = pos; it != end; ++it) for (auto it = std::find(pos, end, '\n'); it != end; it = std::find(it+1, end, '\n'))
{ ((it != pos and *(it-1) == '\r') ? has_crlf : has_lf) = true;
if (*it == '\n') auto eolformat = (has_crlf and not has_lf) ? EolFormat::Crlf : EolFormat::Lf;
((it != pos and *(it-1) == '\r') ? has_crlf : has_lf) = true;
}
const bool crlf = has_crlf and not has_lf;
auto eolformat = crlf ? EolFormat::Crlf : EolFormat::Lf;
FsStatus fs_status{file.st.st_mtim, file.st.st_size, murmur3(file.data, file.st.st_size)}; FsStatus fs_status{file.st.st_mtim, file.st.st_size, murmur3(file.data, file.st.st_size)};
return func(parse_lines(pos, end, eolformat), bom, eolformat, fs_status); return func(parse_lines(pos, end, eolformat), bom, eolformat, fs_status);