Fix handling of carriage return.

This commit is contained in:
chriseth
2021-03-09 15:33:12 +01:00
parent 1d95f95635
commit eb85a4414c
7 changed files with 16 additions and 3 deletions
+4 -3
View File
@@ -19,6 +19,7 @@
#include <liblangutil/CharStream.h>
#include <liblangutil/Exceptions.h>
#include <algorithm>
#include <cmath>
#include <iomanip>
@@ -87,7 +88,7 @@ SourceReference SourceReferenceExtractor::extract(SourceLocation const* _locatio
line = line.substr(
static_cast<size_t>(max(0, start.column - 35)),
static_cast<size_t>(min(start.column, 35)) + static_cast<size_t>(
min(locationLength + 35,len - start.column)
min(locationLength + 35, len - start.column)
)
);
if (start.column + locationLength + 35 < len)
@@ -106,7 +107,7 @@ SourceReference SourceReferenceExtractor::extract(SourceLocation const* _locatio
interest,
isMultiline,
line,
start.column,
end.column,
min(start.column, static_cast<int>(line.length())),
min(end.column, static_cast<int>(line.length()))
};
}