microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'transforms-visitEachChildPerf' into transforms-commentsPerf

Browse Source
This commit is contained in:
Ron Buckton
2016-05-26 22:23:56 -07:00
parent 0dc261d4a2 5d4e47fa2f
commit 2bb8729d8a
12 changed files with 101 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/compiler/comments.ts
View File

@@ -12,6 +12,7 @@ namespace ts {
export function createCommentWriter(host: EmitHost, writer: EmitTextWriter, sourceMap: SourceMapWriter): CommentWriter {
const compilerOptions = host.getCompilerOptions();
const extendedDiagnostics = compilerOptions.extendedDiagnostics;
const newLine = host.getNewLine();
const { emitPos } = sourceMap;
@@ -47,6 +48,11 @@ namespace ts {
emitCallback(node);
}
else {
let commentStart: number;
if (extendedDiagnostics) {
commentStart = performance.mark();
}
const emitFlags = node.emitFlags;
const isEmittedNode = node.kind !== SyntaxKind.NotEmittedStatement;
const skipLeadingComments = pos < 0 || (emitFlags & NodeEmitFlags.NoLeadingComments) !== 0;
@@ -77,7 +83,14 @@ namespace ts {
}
}
emitCallback(node);
if (extendedDiagnostics) {
performance.measure("commentTime", commentStart);
emitCallback(node);
commentStart = performance.mark();
}
else {
emitCallback(node);
}
// Restore previous container state.
containerPos = savedContainerPos;
@@ -89,11 +102,20 @@ namespace ts {
if (!skipTrailingComments && isEmittedNode) {
emitTrailingComments(end);
}
if (extendedDiagnostics) {
performance.measure("commentTime", commentStart);
}
}
}
}
function emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void) {
let commentStart: number;
if (extendedDiagnostics) {
commentStart = performance.mark();
}
const { pos, end } = detachedRange;
const emitFlags = node.emitFlags;
const skipLeadingComments = pos < 0 || (emitFlags & NodeEmitFlags.NoLeadingComments) !== 0;
@@ -103,11 +125,22 @@ namespace ts {
emitDetachedCommentsAndUpdateCommentsInfo(detachedRange, compilerOptions.removeComments);
}
emitCallback(node);
if (extendedDiagnostics) {
performance.measure("commentTime", commentStart);
emitCallback(node);
commentStart = performance.mark();
}
else {
emitCallback(node);
}
if (!skipTrailingComments) {
emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
}
if (extendedDiagnostics) {
performance.measure("commentTime", commentStart);
}
}
function emitLeadingComments(pos: number, isEmittedNode: boolean) {
@@ -147,10 +180,19 @@ namespace ts {
return;
}
let commentStart: number;
if (extendedDiagnostics) {
commentStart = performance.mark();
}
const trailingComments = getTrailingCommentsToEmit(pos);
// trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
emitComments(currentText, currentLineMap, writer, trailingComments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeComment);
if (extendedDiagnostics) {
performance.measure("commentTime", commentStart);
}
}
function getLeadingCommentsToEmit(pos: number) {