maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed out of bounds error; made index start directly at the line number.

Browse source
This commit is contained in:
Daniel Rosenwasser 2015-07-16 22:45:31 -07:00
parent 99f6985115
commit 85b54e8946
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/tsc.ts
View file

@ -117,9 +117,9 @@ namespace ts {
let { line: lastLine, character: lastLineChar } = getLineAndCharacterOfPosition(file, start + length);
output += sys.newLine;
for (let i = 0, indexOfLastLine = lastLine - firstLine; i <= indexOfLastLine; i++) {
let lineStart = getPositionOfLineAndCharacter(file, firstLine + i, 0);
let lineEnd = getPositionOfLineAndCharacter(file, firstLine + i + 1, 0);
for (let i = firstLine; i <= lastLine; i++) {
let lineStart = getPositionOfLineAndCharacter(file, i, 0);
let lineEnd = i < lastLine ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
let lineContent = file.text.slice(lineStart, lineEnd);
lineContent = lineContent.replace(/\s+$/g, ""); // trim from end
lineContent = lineContent.replace("\t", " "); // convert tabs to single spaces
@ -127,13 +127,13 @@ namespace ts {
output += lineContent + sys.newLine;
output += redColorControlChar;
if (i === 0) {
let lastCharForLine = i === indexOfLastLine ? lastLineChar : undefined;
if (i === firstLine) {
let lastCharForLine = i === lastLine ? lastLineChar : undefined;
output += lineContent.slice(0, firstLineChar).replace(/\S/g, " ");
output += lineContent.slice(firstLineChar, lastCharForLine).replace(/./g, "~");
}
else if (i === indexOfLastLine) {
else if (i === lastLine) {
output += lineContent.slice(0, lastLineChar).replace(/./g, "~");
// Don't bother "filling" at the end.
}