Skip to content

Use char code array in createTextWriter #44037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
David Michon (dmichon-msft) wants to merge 5 commits into from
Closed

Use char code array in createTextWriter #44037

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
142f9da
Use char code array in createTextWriter
dmichon-msft May 11, 2021
d821808
Fix indent size
dmichon-msft May 11, 2021
eb9b36b
Minor optimization
dmichon-msft May 11, 2021
b07dc87
Try preserving long strings
dmichon-msft May 11, 2021
7f98bef
Reconcile carriageReturn handling
dmichon-msft May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 116 additions & 21 deletions src/compiler/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3932,32 +3932,116 @@ namespace ts {

export function createTextWriter(newLine: string): EmitTextWriter {
let output: string;
const pendingCharCodes: number[] = [];
let lastChar: number;
let indent: number;
let lineStart: boolean;
let lineCount: number;
let linePos: number;
let totalChars: number = 0;
let hasTrailingComment = false;

function updateLineCountAndPosFor(s: string) {
const lineStartsOfS = computeLineStarts(s);
if (lineStartsOfS.length > 1) {
lineCount = lineCount + lineStartsOfS.length - 1;
linePos = output.length - s.length + last(lineStartsOfS);
lineStart = (linePos - output.length) === 0;
const newLineCodes: number[] = [];
for (let i = 0; i < newLine.length; i++) {
newLineCodes.push(newLine.charCodeAt(i));
}

function appendCharCode(charCode: number) {
++totalChars;
lastChar = charCode;
pendingCharCodes.push(charCode);
if (pendingCharCodes.length >= 1024) {
flushBuffer();
}
else {
lineStart = false;
}

function flushBuffer() {
if (pendingCharCodes.length > 0) {
output += String.fromCharCode.apply(null, pendingCharCodes);
pendingCharCodes.length = 0;
}
}

function appendRawSmall(text: string) {
const len = text.length;
let pos = 0;
while (pos < len) {
const ch = text.charCodeAt(pos);
appendCharCode(ch);
pos++;
switch (ch) {
case CharacterCodes.carriageReturn:
const nextChar = text.charCodeAt(pos);
if (nextChar === CharacterCodes.lineFeed) {
appendCharCode(nextChar);
pos++;
}
// falls through
case CharacterCodes.lineFeed:
++lineCount;
linePos = totalChars;
break;
default:
if (ch > CharacterCodes.maxAsciiCharacter && isLineBreak(ch)) {
++lineCount;
linePos = totalChars;
}
break;
}
}

lineStart = linePos === totalChars;
}

function appendRawLarge(text: string) {
flushBuffer();

const len = text.length;
let pos = 0;
while (pos < len) {
const ch = text.charCodeAt(pos);
++totalChars;
lastChar = ch;
pos++;
switch (ch) {
case CharacterCodes.carriageReturn:
const nextChar = text.charCodeAt(pos);
if (nextChar === CharacterCodes.lineFeed) {
++totalChars;
lastChar = nextChar;
pos++;
}
// falls through
case CharacterCodes.lineFeed:
++lineCount;
linePos = totalChars;
break;
default:
if (ch > CharacterCodes.maxAsciiCharacter && isLineBreak(ch)) {
++lineCount;
linePos = totalChars;
}
break;
}
}

lineStart = linePos === totalChars;
output += text;
}

function writeText(s: string) {
if (s && s.length) {
if (lineStart) {
s = getIndentString(indent) + s;
lineStart = false;
for (let i = 0, totalIndent = indent * getIndentSize(); i < totalIndent; i++) {
appendCharCode(CharacterCodes.space);
}
// lineStart will be automatically cleared by the append
}
if (s.length > 256) {
appendRawLarge(s);
} else {
appendRawSmall(s);
}
output += s;
updateLineCountAndPosFor(s);
}
}

Expand All @@ -3978,12 +4062,18 @@ namespace ts {
lineCount = 0;
linePos = 0;
hasTrailingComment = false;
pendingCharCodes.length = 0;
lastChar = 0;
totalChars = 0;
}

function rawWrite(s: string) {
if (s !== undefined) {
output += s;
updateLineCountAndPosFor(s);
if (s.length > 256) {
appendRawLarge(s);
} else {
appendRawSmall(s);
}
hasTrailingComment = false;
}
}
Expand All @@ -3996,16 +4086,18 @@ namespace ts {

function writeLine(force?: boolean) {
if (!lineStart || force) {
output += newLine;
for (let i = 0, len = newLineCodes.length; i < len; i++) {
appendCharCode(newLineCodes[i]);
}
lineCount++;
linePos = output.length;
linePos = totalChars;
lineStart = true;
hasTrailingComment = false;
}
}

function getTextPosWithWriteLine() {
return lineStart ? output.length : (output.length + newLine.length);
return lineStart ? totalChars : (totalChars + newLineCodes.length);
}

reset();
Expand All @@ -4018,13 +4110,16 @@ namespace ts {
increaseIndent: () => { indent++; },
decreaseIndent: () => { indent--; },
getIndent: () => indent,
getTextPos: () => output.length,
getTextPos: () => totalChars,
getLine: () => lineCount,
getColumn: () => lineStart ? indent * getIndentSize() : output.length - linePos,
getText: () => output,
getColumn: () => lineStart ? indent * getIndentSize() : totalChars - linePos,
getText: () => {
flushBuffer();
return output;
},
isAtStartOfLine: () => lineStart,
hasTrailingComment: () => hasTrailingComment,
hasTrailingWhitespace: () => !!output.length && isWhiteSpaceLike(output.charCodeAt(output.length - 1)),
hasTrailingWhitespace: () => !!lastChar && isWhiteSpaceLike(lastChar),
clear: reset,
reportInaccessibleThisError: noop,
reportPrivateInBaseOfClassExpression: noop,
Expand Down