working_files: normalize \r\n and \n to \n

Some clients may normalize end-of-line sequences, thus cause a mismatch between index_lines and buffer_lines.
MaskRay · Mar 1, 2019 · 86fe121 · 86fe121
1 parent 00158e2
commit 86fe121
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/working_files.cc b/src/working_files.cc
@@ -59,8 +59,11 @@ std::vector<std::string> ToLines(const std::string &content) {
   std::vector<std::string> result;
   std::istringstream lines(content);
   std::string line;
-  while (getline(lines, line))
+  while (getline(lines, line)) {
+    if (line.size() && line.back() == '\r')
+      line.pop_back();
     result.push_back(line);
+  }
   return result;
 }